Merge remote-tracking branch 'origin/master'

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

@@ -148,12 +148,11 @@ public class BizDayworkController extends BaseController {
         List<BizLot> lots = new ArrayList<>();
         if (!keywords.isEmpty()) {
             lots = bizLotService.query().like("lot_code", keywords).list();
-            if(lots.size()==0){
-              return   success(new ArrayList<>());
+            if(lots.isEmpty()){
+              return success(new ArrayList<>());
             }
         }
 
-
         // 获取当前用户的，针对当前部门以及当前生产计划下的报工集合
         List<BizDayworkItem> myDayworkItems = bizDayworkItemService.query()
                 .eq("dept_id", deptId)
@@ -179,6 +178,9 @@ public class BizDayworkController extends BaseController {
                         .in("lot_id", lotIds)
                         .list();
             }
+            if (dayworks.isEmpty())
+                return success(new ArrayList<>());
+
             planDetailslanDetails = bizProductionPlanDetailService.query().in("id", dayworks.stream().map(BizDaywork::getProductionPlanDetailId).collect(Collectors.toList())).list();
             // 根据得到的 daywork 集合，将 daywork_id 整合到集合中
             List<Long> allDayworkIdList = dayworks.stream().map(BizDaywork::getId).collect(Collectors.toList());
@@ -196,7 +198,7 @@ public class BizDayworkController extends BaseController {
         // 对之前获取到的 daywork 集合进行过滤，将符合条件的daywork，添加到dayworkList集合中
         for (BizDaywork item : dayworks) {
 
-            if (planDetailslanDetails.size() > 0) {
+            if (!planDetailslanDetails.isEmpty()) {
                 //设置尾批量
                 item.setLastLotQuantity(planDetailslanDetails.stream().filter(v -> v.getId().equals(item.getProductionPlanDetailId())).collect(Collectors.toList()).get(0).getLastLotQuantity());
             }
@@ -232,6 +234,7 @@ public class BizDayworkController extends BaseController {
         // 如果有报工数据
         if (!dayworkList.isEmpty()) {
             // 将符合条件（需要在页面展示的daywork）的 dayworkList 中的 technologicalProcessId，整合到一个List集合中，需要根据这些technologicalProcessId，获取到相应的工艺工序清单
+            System.out.println("有报工数据:"+dayworkList);
             List<Long> technologicalProcessIds = dayworkList.stream()
                     .map(BizDaywork::getTechnologicalProcessId)
                     .collect(Collectors.toList());
@@ -801,7 +804,7 @@ public class BizDayworkController extends BaseController {
             if (num < lotNumber || (bizDaywork.getIsWasteRecycling() == null ? false : bizDaywork.getIsWasteRecycling() == 1) || bizDaywork.getFromId() != 0) {
                 //查询该批次号是否已经被领取
                 List<BizDaywork> lotId = bizDayworkService.query().eq("lot_id", bizDaywork.getLotId()).list();
-                if (lotId.size() > 0) {
+                if (!lotId.isEmpty()) {
                     return error("批次号已被领取");
                 } else {
                     //查询出该工段下的工序
@@ -853,7 +856,7 @@ public class BizDayworkController extends BaseController {
 
         } else {
             /** 查询当前批次报工的载具，ischanged 为当前载具 */
-            if (bizDaywork.getDayworkCarriers().size() == 0) {
+            if (bizDaywork.getDayworkCarriers().isEmpty()) {
                 return error("该批次未选择载具");
             }
             List<BizDayworkItem> currentItems = bizDayworkItemService.query().eq("daywork_id", bizDaywork.getId()).orderByDesc("create_time").list();
@@ -877,7 +880,7 @@ public class BizDayworkController extends BaseController {
 //                                    .last("and exists (select 1 from biz_daywork where biz_daywork.id = biz_daywork_carrier.daywork_id and biz_daywork.deleted = 0)")
                                     .list();
                     bizDayworkCarrierService.list(new QueryWrapper<BizDayworkCarrier>());
-                    if (carrierList.size() > 0) {
+                    if (!carrierList.isEmpty()) {
                         BizDaywork daywork = bizDayworkService.getById(carrierList.get(0).getDayworkId());
                         List<BizDayworkItem> itemList = bizDayworkItemService.query().eq("daywork_id", daywork.getId()).orderByDesc("create_time").list();
                         if (!daywork.getProductionPlanDetailId().equals(bizDaywork.getProductionPlanDetailId()) || !currentItems.get(0).getTechnologicalProcessDetailId().equals(itemList.get(0).getTechnologicalProcessDetailId())) {
@@ -906,7 +909,7 @@ public class BizDayworkController extends BaseController {
     public AjaxResult check(@RequestBody BizDaywork bizDaywork) {
 
         List<BizDayworkCarrier> list = bizDayworkCarrierService.query().eq("is_changed", 0).eq("daywork_id", bizDaywork.getId()).list();
-        if (list.size() == 0) {
+        if (list.isEmpty()) {
             return error("该批次未绑定载具");
         }
         return success();
@@ -924,7 +927,7 @@ public class BizDayworkController extends BaseController {
         // 判断是否被领取
         List<BizCarrier> availableCarrierList = bizDayworkService.getAvailableCarrierList(new BizCarrier());
         List<BizCarrier> isReceived = availableCarrierList.stream().filter(item -> bizDayworkItem.getCarrierId().equals(item.getCarrierId())).collect(Collectors.toList());
-        if (isReceived.size() == 0) {
+        if (isReceived.isEmpty()) {
             return error("该批次已被领取");
         }
         /*
@@ -953,7 +956,7 @@ public class BizDayworkController extends BaseController {
 
 // 将最后一个对象添加到新数组中
         newItemList.add(lastItem);
-        if (newItemList.size() > 0) {
+        if (!newItemList.isEmpty()) {
             newItemList.remove(0);
         }
 
@@ -972,7 +975,7 @@ public class BizDayworkController extends BaseController {
         // 判断该批次是否已被领取
         // 获取该批次最后一条的状态
         List<BizDayworkCarrier> bizDayworkCarriers = bizDayworkCarrierService.query().eq("carrier_id", bizDayworkItem.getCarrierId()).eq("is_changed", 0).list();
-        if (bizDayworkCarriers.size() == 0) {
+        if (bizDayworkCarriers.isEmpty()) {
             throw new RuntimeException("该载具未绑定任何批次！");
         }
 
@@ -996,7 +999,7 @@ public class BizDayworkController extends BaseController {
                 turnoverItems.add(bizDaywork.getDayworkItemList().get(0));
             }
         }
-        if (turnoverItems.size() > 0) {
+        if (!turnoverItems.isEmpty()) {
             BizDayworkItem conditions = new BizDayworkItem();
             conditions.setIds(turnoverItems.stream().map(BizDayworkItem::getId).collect(Collectors.toList()));
             List<BizDayworkItem> items = bizDayworkItemService.getList(conditions);

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();