提交

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -1173,6 +1173,8 @@ public class BizDayworkItemController extends BaseController {
                 bizItem.setProcessId(lastItem.getProcessId());
                 bizItem.setTechnologicalProcessDetailId(lastItem.getTechnologicalProcessDetailId());
                 bizItem.setStatus(bizDayworkItem.getStatus());
+                bizItem.setFromDeptId(lastItem.getDeptId());
+                bizItem.setFromDeptName(lastItem.getDeptName());
                 if (bizDayworkItem.getStatus().equals("7")||bizDayworkItem.getStatus().equals("4")) {
                     v.setDeptId(bizDayworkItem.getDeptId());
                     v.setProcessQualifiedNum(v.getTemporaryProcessQualifiedNum());
@@ -1279,6 +1281,8 @@ public class BizDayworkItemController extends BaseController {
                 bizItem.setProcessId(lastItem.getProcessId());
                 bizItem.setTechnologicalProcessDetailId(lastItem.getTechnologicalProcessDetailId());
                 bizItem.setStatus(bizDayworkItem.getStatus());
+                bizItem.setFromDeptId(lastItem.getDeptId());
+                bizItem.setFromDeptName(lastItem.getDeptName());
                 //添加分选-包装的审核申请
                 if(bizDayworkItem.getIsNextPacking()) {
                     //如果有审核申请，则删除审核申请，重新新增

src/main/java/cn/ezhizao/project/business/product/controller/BizQuickDayworkController.java

@@ -177,6 +177,8 @@ public class BizQuickDayworkController extends BaseController {
             if (quickItem != null) {
                 // 应该周转的批次 一起周转
                 BizDayworkItem turnItem = new BizDayworkItem();
+                turnItem.setFromDeptId(latestItem.getDeptId());
+                turnItem.setFromDeptName(latestItem.getDeptName());
                 turnItem.setDayworkId(latestItem.getDayworkId());
                 turnItem.setProcessId(latestItem.getProcessId());
                 turnItem.setTechnologicalProcessDetailId(latestItem.getTechnologicalProcessDetailId());

src/main/java/cn/ezhizao/project/business/product/domain/BizDayworkItem.java

@@ -306,4 +306,7 @@ public class BizDayworkItem extends BaseEntity
     private Integer adoptStatus;
     @TableField(exist = false)
     private String message;
+
+    private String fromDeptName;
+    private Long fromDeptId;
 }

src/main/java/cn/ezhizao/project/business/switchDept/controller/SwitchController.java

@@ -224,7 +224,9 @@ public class SwitchController extends BaseController {
             bizDayworkItem.setEquipmentDetailId(l.getEquipmentDetailId());
             bizDayworkItem.setEquipmentDetailCode(l.getEquipmentDetailCode());
             bizDayworkItem.setDeptId(item.getDeptId());
+            bizDayworkItem.setFromDeptId(l.getDeptId());
             bizDayworkItem.setDeptName(item.getDeptName());
+            bizDayworkItem.setFromDeptName(l.getDeptName());
             bizDayworkItem.setStartTime(item.getStartTime());
             bizDayworkItem.setTurnoverType(item.getTurnoverType());
             bizDayworkItem.setTurnoverArea(item.getTurnoverArea());
@@ -311,7 +313,9 @@ public class SwitchController extends BaseController {
                 bizItem.setTechnologicalProcessId(v.getTechnologicalProcessId());
                 bizItem.setProdNum(v.getProdNum());
                 bizItem.setDeptId(item.getDeptId());
+                bizItem.setFromDeptId(v.getDeptId());
                 bizItem.setDeptName(item.getDeptName());
+                bizItem.setFromDeptName(v.getDeptName());
                 bizItem.setStartTime(item.getStartTime());
                 bizItem.setTurnoverType(item.getTurnoverType());
                 bizItem.setTurnoverArea(item.getTurnoverArea());