wangxin преди 1 година
родител
ревизия
494bc7386d
променени са 1 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 3 2
      src/main/java/cn/ezhizao/project/business/product/controller/BizQuickDayworkController.java

+ 3 - 2
src/main/java/cn/ezhizao/project/business/product/controller/BizQuickDayworkController.java

@@ -338,6 +338,7 @@ public class BizQuickDayworkController extends BaseController {
     @Log(title = "报工", businessType = BusinessType.INSERT)
     @Transactional
     public AjaxResult addNewDayworkItem(@RequestBody List<BizDayworkItem> dayworkItemList) {
+        System.out.println("批量开始报工:"+dayworkItemList);
         // 新建报工明细
         List<BizDayworkItem> adds = new ArrayList<>();
         // 更新报工明细
@@ -364,7 +365,7 @@ public class BizQuickDayworkController extends BaseController {
                 l.setStatus("7");
                 updates.add(l);
                 l.getDaywork().setDeptId(l.getDeptId());
-                l.getDaywork().setProcessQualifiedNum(l.getProdNum());
+                l.getDaywork().setProcessQualifiedNum(l.getDaywork().getTemporaryProcessQualifiedNum());
                 updateDaywork.add(l.getDaywork());
             }
             BizDayworkItem bizDayworkItem = new BizDayworkItem();
@@ -387,7 +388,7 @@ public class BizQuickDayworkController extends BaseController {
             bizDayworkItem.setLotId(l.getDaywork().getLotId());
             bizDayworkItem.setIsQuick(1);
             bizDayworkItem.setStatus("1");
-            bizDayworkItem.setProdNum(l.getProdNum());
+            bizDayworkItem.setProdNum(l.getQualifiedNum());
             bizDayworkItem.setDeptName(l.getDeptName());
             bizDayworkItem.setId(snowflakeIdWorker.nextId());
             BizQuickDayworkNextInfo quickInfo = new BizQuickDayworkNextInfo();