瀏覽代碼

修改bug

姚云青 3 年之前
父節點
當前提交
706d2bac5a

+ 2 - 1
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -378,7 +378,8 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
                         for (int partNum = 0; partNum < planProduct.getPlanBomNum(); partNum++) {
                             TWorkpiece workpiece = new TWorkpiece();
                             workpiece.setBomId(planProduct.getBomId()).setCompleteBatchNo(UUID.randomUUID().toString().replace("-", "")).setOrderId(planProduct.getOrderId()).setOrderNo(planProduct.getOrderNo())
-                                    .setPlanId(planProduct.getPlanId()).setPlanNo(planProduct.getPlanNo()).setBomName(bbomsMap.get(planProduct.getBomId()).getName()).setBomNo(bbomsMap.get(planProduct.getBomId()).getNo()).setOrderName(oriBean.getOrderName());
+                                    .setPlanId(planProduct.getPlanId()).setPlanNo(planProduct.getPlanNo()).setBomName(bbomsMap.get(planProduct.getBomId()).getName()).setBomNo(bbomsMap.get(planProduct.getBomId()).getNo()).setOrderName(oriBean.getOrderName())
+                            .setIsEnd("0");
                             workpieceMapper.insert(workpiece);
 
                             // 生成task表,因为工序定了以后不变,排产时只需更新预计开始时间和结束时间

+ 1 - 1
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/ZZoneServiceImpl.java

@@ -196,7 +196,7 @@ public class ZZoneServiceImpl extends SuperServiceImpl<ZZoneMapper, ZZone> imple
         //先查出当前产线的零件
         List<BBom>bBomList = bomMapper.selectList(Wraps.<BBom>lbQ().eq(BBom::getZoneId, data.getId()));
 
-        List<TWorkpiece>workpieceList = workpieceService.list(Wraps.<TWorkpiece>lbQ().ne(TWorkpiece::getIsEnd, "1").in(TWorkpiece::getBomId,bBomList));
+        List<TWorkpiece>workpieceList = workpieceService.list(Wraps.<TWorkpiece>lbQ().eq(TWorkpiece::getIsEnd, "0").in(TWorkpiece::getBomId,bBomList));
 
         if(CollectionUtil.isNotEmpty(workpieceList)){
             workpieceList.stream().map((t) -> {