0627

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

@@ -1283,6 +1283,6 @@ public class BizDayworkController extends BaseController {
             carrierCode = carrierList.stream().collect(Collectors.joining("、"));
             item.setCarrierCode(carrierCode);
         }
-        return success(dayworkItemList);
+        return success(dayworkItemList.stream().sorted(Comparator.comparing(BizDayworkItem::getLotCode)).collect(Collectors.toList()));
     }
 }

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

@@ -565,6 +565,8 @@ public class BizDayworkItemController extends BaseController {
                 item.setDayworkItemId(bizDayworkItem.getId());
                 item.setDayworkId(bizDayworkItem.getDayworkId());
                 item.setLotId(bizDayworkItem.getLotId());
+                item.setDeptId(bizDayworkItem.getDeptId());
+                item.setProcessId(bizDayworkItem.getProcessId());
             }
         }
         // 自动派活

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

@@ -161,7 +161,6 @@ public class SortDayworkController extends BaseController {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult finish(@RequestBody BizDayworkItem bizDayworkItem) {
         BizDayworkItem item = bizDayworkItemService.getById(bizDayworkItem.getId());
-
         BizDayworkItemReject delCondition = new BizDayworkItemReject();
         delCondition.setDayworkItemId(item.getId());
         bizDayworkItemRejectService.physicalDelete(delCondition);
@@ -174,6 +173,8 @@ public class SortDayworkController extends BaseController {
             l.setProductionPlanDetailId(item.getProductionPlanDetailId());
             l.setProductionPlanDetailSubDetailId(item.getProductionPlanDetailSubDetailId());
             l.setReason(l.getReason());
+            l.setDeptId(item.getDeptId());
+            l.setProcessId(item.getProcessId());
         });
         boolean result = rejectList.isEmpty() || bizDayworkItemRejectService.saveBatch(rejectList);
         item.setRejectNum(bizDayworkItem.getRejectNum());

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

@@ -3,6 +3,7 @@ package cn.ezhizao.project.business.product.domain;
 
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -38,6 +39,8 @@ public class BizDayworkItemReject extends BaseEntity
     /** 计划单明细id */
     @ApiModelProperty(value = "${comment}")
     private Long productionPlanDetailId;
+    private Long deptId;
+    private Long processId;
 
     /** 子计划id */
     @ApiModelProperty(value = "${comment}")
@@ -82,7 +85,4 @@ public class BizDayworkItemReject extends BaseEntity
     @ApiModelProperty("类型")
     private Integer type;
 
-    @ApiModelProperty("部门id")
-    private Long deptId;
-
 }