提交

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

@@ -523,6 +523,7 @@ public class BizQuickDayworkController extends BaseController {
     @Transactional
     public AjaxResult addNewDayworkItem(@RequestBody List<BizDayworkItem> dayworkItemList) {
         System.out.println("批量开始报工:"+dayworkItemList);
+        SysDept sysDept = deptService.selectDeptById(dayworkItemList.get(0).getDeptId());
         // 新建报工明细
         List<BizDayworkItem> adds = new ArrayList<>();
         // 更新报工明细
@@ -538,7 +539,7 @@ public class BizQuickDayworkController extends BaseController {
         info.setWorkshopId(dayworkItemList.get(0).getQuickInfo().getWorkshopId());
         info.setDeptName(dayworkItemList.get(0).getQuickInfo().getDeptName());
         // 判断是车间内周转还是外周转
-        if (!info.getWorkshopId().equals(dayworkItemList.get(0).getWorkshopId())) {
+        if (!info.getWorkshopId().equals(sysDept.getWorkshopId())) {
             info.setTurnoverType("2");
             info.setTurnoverArea(bizWorkshopTurnoverService.query().eq("workshop_id", info.getWorkshopId()).eq("status",0).orderByAsc("create_time").list().get(0).getCode());
             //0628快速报工将id存入

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

@@ -227,6 +227,8 @@ public class BizDaywork extends BaseEntity
     private List<Long> productionPlanDetailIds;
     @TableField(exist = false)
     private String workshopName;
+    @TableField(exist = false)
+    private Long workshopId;
     @TableField(exist =false)
     private Boolean hasFinishOutsource;
 }