Merge remote-tracking branch 'origin/mode-min-unit' into mode-min-unit

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -2975,17 +2975,20 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     @Override
     @Transactional
     public R addMaterial(AddMaterialReq req) {
-        if (ObjectUtil.isEmpty(req.getBatchNumbers())) {
-            return R.error("批次号不可为空");
-        }
+        //分割批次号
+        List<String> batchNumberList = new LinkedList<>();
+//        if (ObjectUtil.isEmpty(req.getBatchNumbers())) {
+//            return R.error("批次号不可为空");
+//        }
         if (ObjectUtil.isEmpty(req.getBlankId())) {
             return R.error("坯料计划ID为空");
         }
         if (ObjectUtil.isEmpty(req.getProcessId())) {
             return R.error("坯料计划第一道工序作业的ID为空");
         }
-        //分割批次号
-        List<String> batchNumberList = Arrays.asList(req.getBatchNumbers().split(","));
+        if (ObjectUtil.isNotEmpty(req.getBatchNumbers())) {
+            batchNumberList = new LinkedList<>(Arrays.asList(req.getBatchNumbers().split(",")));
+        }
         //查询坯料计划详情
         ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(req.getBlankId());
         //查询坯料计划第一道工序作业的详情
@@ -3018,20 +3021,43 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             }
         }
 
+        //如果批次号有重复，则错误提示：批次号{批次号}重复
+        for (String item : batchNumberList) {
+            if (batchNumberList.stream().filter(i -> i.equals(item)).count() > 1) {
+                return R.error("批次号" + item + "重复");
+            }
+        }
+
 
-        //如果坯料类型=热轧，检查每个批次号
         //如果批次号不是9位数，则错误提示：热轧坯料批次号{批次号}错误，应该是9位
+
+        for (String s : batchNumberList) {
+            if (s.length() != 9) {
+                return R.error("热轧坯料批次号" + s + "错误，应该是9位");
+            }
+        }
+        List<ApsWorkInProgressInventoryDo> workInProgressInventoryDos = new LinkedList<>();
+        if (ObjectUtil.isNotEmpty(addBatchNumberList)) {
+            //查询新增的批次号
+            workInProgressInventoryDos =
+                    apsWorkInProgressInventoryService.list(new QueryWrapper<ApsWorkInProgressInventoryDo>().lambda()
+                            .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
+                            .in(ApsWorkInProgressInventoryDo::getBatchnumber, addBatchNumberList));
+        }
+
+        //如果坯料类型=热轧，检查每个批次号
         if (apsBlankOrderDo.getBlanktype().equals("热轧")) {
-            for (String s : batchNumberList) {
-                if (s.length() != 9) {
-                    return R.error("热轧坯料批次号" + s + "错误，应该是9位");
+            for (String s : addBatchNumberList) {
+                //如果该批次号物料在制品库存中存在，则错误提示：批次号{批次号}错误
+                ApsWorkInProgressInventoryDo apsWorkInProgressInventoryDo = workInProgressInventoryDos.stream().filter(item -> item.getBatchnumber().equals(s)).findFirst().orElse(null);
+                if (ObjectUtil.isNotEmpty(apsWorkInProgressInventoryDo)) {
+                    return R.error("批次号" + s + "错误");
                 }
             }
         }
 
         /**
-         * 如果坯料类型=铸轧，检查每个批次号
-         * 如果该批次号物料在制品库存中没找到，则错误提示：批次号{批次号}错误
+         * 如果坯料类型=铸轧，按以下步骤检查新增的每个批次号，如果该批次号物料在制品库存中存在
          * 如果在制品备料计划ID不为空，并且不等于该坯料计划ID，错误提示：该坯料已经被其他坯料计划领料
          * 如果在制品状态=待加工或加工中或待检验，错误提示：批次号{批次号}错误，该料卷在加工中
          * 如果在制品状态=待入库或已入库或已出库，并且订单号对应订单的客户的客户类型不是内部客户，错误提示：批次号{批次号}错误，该料卷是其他客户订单的成品
@@ -3042,15 +3068,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
          */
         //如果坯料类型=铸轧，检查每个批次号
         if (apsBlankOrderDo.getBlanktype().equals("铸轧")) {
-            List<ApsWorkInProgressInventoryDo> workInProgressInventoryDos =
-                    apsWorkInProgressInventoryService.list(new QueryWrapper<ApsWorkInProgressInventoryDo>().lambda()
-                            .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
-                            .in(ApsWorkInProgressInventoryDo::getBatchnumber, addBatchNumberList));
             for (String s : addBatchNumberList) {
                 //如果该批次号物料在制品库存中没找到，则错误提示：批次号{批次号}错误
                 ApsWorkInProgressInventoryDo apsWorkInProgressInventoryDo = workInProgressInventoryDos.stream().filter(item -> item.getBatchnumber().equals(s)).findFirst().orElse(null);
                 if (ObjectUtil.isEmpty(apsWorkInProgressInventoryDo)) {
-                    return R.error("批次号" + s + "错误");
+                    continue;
                 }
 
                 //如果在制品备料计划ID不为空，并且不等于该坯料计划ID，错误提示：该坯料已经被其他坯料计划领料
@@ -3060,24 +3082,24 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     return R.error("该坯料已经被坯料计划" + blankOrderDo.getBlanknumber() + "领料");
                 }
 
+                //如果在制品类型=不良在制品，错误提示：批次号{批次号}错误，该料卷检验不合格
+                if (apsWorkInProgressInventoryDo.getWorkinprocesstype().equals("不良在制品")) {
+                    return R.error("批次号" + s + "错误，该料卷检验不合格");
+                }
+
                 //如果在制品状态=待加工或加工中或待检验，错误提示：批次号{批次号}错误，该料卷在加工中
                 if (Arrays.asList("待加工", "加工中", "待检验").contains(apsWorkInProgressInventoryDo.getWorkinprocessstatus())) {
                     return R.error("批次号" + s + "错误，该料卷在加工中");
                 }
 
-                //如果在制品状态=备料中、待入库或已入库或已出库，并且订单号对应订单的客户的客户类型不是内部客户，错误提示：批次号{批次号}错误，该料卷是其他客户订单的成品
-                if (Arrays.asList("备料中", "待入库", "已入库", "已出库").contains(apsWorkInProgressInventoryDo.getWorkinprocessstatus())) {
+                //如果在制品状态=待入库或已入库或已出库，并且订单号对应订单的客户的客户类型不是内部客户，错误提示：批次号{批次号}错误，该料卷是其他客户订单的成品
+                if (Arrays.asList("待入库", "已入库", "已出库").contains(apsWorkInProgressInventoryDo.getWorkinprocessstatus())) {
                     if (ObjectUtil.isNotEmpty(apsWorkInProgressInventoryDo.getOrdertype()) && apsWorkInProgressInventoryDo.getOrdertype().equals("客户订单")) {
                         return R.error("批次号" + s + "错误，该料卷是其他客户订单的成品");
                     }
 
                 }
 
-                //如果在制品类型=不良在制品，错误提示：批次号{批次号}错误，该料卷检验不合格
-                if (apsWorkInProgressInventoryDo.getWorkinprocesstype().equals("不良在制品")) {
-                    return R.error("批次号" + s + "错误，该料卷检验不合格");
-                }
-
                 //查找该批次号物料=在制品的作业输出物料ID对应输出物料
                 //如果{该批次号物料的输入物料描述}与{坯料的输入物料描述}不相同，
                 //错误提示：该批次号{批次号}物料：{该批次号物料的输入物料描述}不是该坯料计划所需的坯料{坯料的输入物料描述}
@@ -3097,11 +3119,13 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
          * 在制品的备料计划ID=该坯料计划ID
          */
         //原批次号（修改前的值），对应的所有在制品的在制品状态=备料中，在制品的备料计划ID=(空)
-        apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
-                .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, null)
-                .set(ApsWorkInProgressInventoryDo::getWorkinprocessstatus, "备料中")
-                .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
-                .in(ApsWorkInProgressInventoryDo::getBatchnumber, delBatchNumberList));
+        if (ObjectUtil.isNotEmpty(delBatchNumberList)) {
+            apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
+                    .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, null)
+                    .setSql("WORKINPROCESSSTATUS = REMARK")
+                    .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
+                    .in(ApsWorkInProgressInventoryDo::getBatchnumber, delBatchNumberList));
+        }
 
         //更新坯料计划的第一道工序作业的所有工序作业明细的待加工料卷批次号=领料批次号逗号拼接
         apsProcessOperationProcessEquService.update(new UpdateWrapper<ApsProcessOperationProcessEquDo>().lambda()
@@ -3111,11 +3135,14 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
         //在制品的在制品状态=待加工
         //在制品的备料计划ID=该坯料计划ID
-        apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
-                .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, req.getBlankId())
-                .set(ApsWorkInProgressInventoryDo::getWorkinprocessstatus, "待加工")
-                .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
-                .in(ApsWorkInProgressInventoryDo::getBatchnumber, addBatchNumberList));
+        if (ObjectUtil.isNotEmpty(addBatchNumberList)) {
+            apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
+                    .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, req.getBlankId())
+                    .setSql("REMARK = WORKINPROCESSSTATUS")
+                    .set(ApsWorkInProgressInventoryDo::getWorkinprocessstatus, "待加工")
+                    .eq(ApsWorkInProgressInventoryDo::getDeleted, "0")
+                    .in(ApsWorkInProgressInventoryDo::getBatchnumber, addBatchNumberList));
+        }
 
         return R.ok();
     }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductionOrderServiceImpl.java

@@ -104,6 +104,8 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
     private NewSysMindMappingService newSysMindMappingService;
     @Autowired
     private NewSysMindMappingDao newSysMindMappingDao;
+    @Autowired
+    private ApsProcessOperationProcessEquService apsProcessOperationProcessEquService;
 
 
     public static final String ERROR_MSG = "%s上诉订单的排程交货期大于承诺交货期";
@@ -357,6 +359,13 @@ public class ApsProductionOrderServiceImpl extends ServiceImpl<ApsProductionOrde
                 if (!publish.getCode().equals("200")) {
                     throw new RuntimeException(publish.getMsg());
                 }
+            } else {
+                if (ObjectUtil.isNotEmpty(apsBlankOrderDoList)) {
+                    //更新生产状态
+                    CommonUpdateProductionStatusReq request = new CommonUpdateProductionStatusReq();
+                    request.setBlankId(apsBlankOrderDoList.get(0).getId());
+                    apsProcessOperationProcessEquService.updateProductionStatus(request);
+                }
             }
         }
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportOutputServiceImpl.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.rongwei.bscommon.sys.dao.ApsReportOutputDao;
 import com.rongwei.bscommon.sys.service.ApsProcessOperationOutMaterService;
+import com.rongwei.bscommon.sys.service.ApsProcessOperationService;
 import com.rongwei.bscommon.sys.service.ApsReportRecordsService;
 import com.rongwei.bscommon.sys.utils.QRCodeGenerator;
+import com.rongwei.bsentity.domain.ApsProcessOperationDo;
 import com.rongwei.bsentity.domain.ApsProcessOperationOutMaterDo;
 import com.rongwei.bsentity.domain.ApsReportOutputDo;
 import com.rongwei.bsentity.domain.ApsReportRecordsDo;
@@ -42,6 +44,8 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
     private CXAdminFeginClient cxAdminFeginClient;
     @Autowired
     private ApsReportRecordsService apsReportRecordsService;
+    @Autowired
+    private ApsProcessOperationService apsProcessOperationService;
 
     @Override
     @Transactional
@@ -152,22 +156,69 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
                 apsReportOutputDo.setQrcode(qrCode);
                 resList.add(apsReportOutputDo);
             } else {//输出物料数量>1，或者单卷输出数量>1
-                //分卷开始初始化值
-                int j = 1;
-                for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
-                    int outval = apsProcessOperationOutMaterDo.getOutval();
-                    for (int i = 1; i <= outval; i++) {
-                        //插入记录物料子表
-                        ApsReportOutputDo apsReportOutputDo = new ApsReportOutputDo();
+                //查询工序作业信息
+                ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(req.getProcessId());
+                //分切工序
+                if (apsProcessOperationDo.getProcess().equals("分切")) {
+                    int j = 1;//初始化分切车次
+                    for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
+                        //每个输出物料的分切车次
+                        Integer splittrainno = apsProcessOperationOutMaterDo.getSplittrainno();
+                        //输出卷数
+                        Integer outval = apsProcessOperationOutMaterDo.getOutval();
+                        //每次分切的卷数
+                        int count = outval / splittrainno;
+                        //分切车次循环
+                        for (int k = 0; k < splittrainno; k++) {
+                            //分卷循环
+                            for (int i = 1; i <= count; i++) {
+                                //插入记录物料子表
+                                ApsReportOutputDo apsReportOutputDo = new ApsReportOutputDo();
 
-                        apsReportOutputDo.setMainid(req.getMainId());
-                        apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
-                        apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
-                        apsReportOutputDo.setLevel(req.getLevel());
-                        //生成批次号
-                        //不用走系统生成的批次号了，按照输入的批次号就行分卷就行
-                        String code = req.getInputBatchNumber() + "-" + j;
-                        j++;
+                                apsReportOutputDo.setMainid(req.getMainId());
+                                apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
+                                apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
+                                apsReportOutputDo.setLevel(req.getLevel());
+                                //生成批次号
+                                String code = req.getInputBatchNumber() + "-" + j + "-" + i;
+
+                                apsReportOutputDo.setOutputnumber(code);
+                                JSONObject json = new JSONObject();
+                                json.put("batchNumber", code);
+                                //生成二维码
+                                String qrCode = QRCodeGenerator.stringToQRCodeBase64(json.toJSONString(), 200, 200, "png");
+                                apsReportOutputDo.setQrcode(qrCode);
+
+                                apsReportOutputDo.setId(SecurityUtil.getUUID());
+                                apsReportOutputDo.setThickness(apsProcessOperationOutMaterDo.getThickness());
+                                apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
+                                apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
+                                apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
+                                apsReportOutputDo.setInsepctionlevel(insepctionLevel);
+                                apsReportOutputDo.setQualified(qualified);
+                                resList.add(apsReportOutputDo);
+
+                            }
+                            j++;
+                        }
+                    }
+                } else {//非分切工序
+                    //分卷开始初始化值
+                    int j = 1;
+                    for (ApsProcessOperationOutMaterDo apsProcessOperationOutMaterDo : list) {
+                        int outval = apsProcessOperationOutMaterDo.getOutval();
+                        for (int i = 1; i <= outval; i++) {
+                            //插入记录物料子表
+                            ApsReportOutputDo apsReportOutputDo = new ApsReportOutputDo();
+
+                            apsReportOutputDo.setMainid(req.getMainId());
+                            apsReportOutputDo.setOutputid(apsProcessOperationOutMaterDo.getId());
+                            apsReportOutputDo.setOutputmaterial(apsProcessOperationOutMaterDo.getOutputmaterial());
+                            apsReportOutputDo.setLevel(req.getLevel());
+                            //生成批次号
+                            //不用走系统生成的批次号了，按照输入的批次号就行分卷就行
+                            String code = req.getInputBatchNumber() + "-" + j;
+                            j++;
 
 //                        //生成批次号
 //                        SysSerialVo vo = new SysSerialVo();
@@ -179,21 +230,22 @@ public class ApsReportOutputServiceImpl extends ServiceImpl<ApsReportOutputDao,
 //                        Map<String, Object> codeData = cxAdminFeginClient.getSerialNumberCode(vo).getData();
 //                        String code = codeData.get("code").toString();
 
-                        apsReportOutputDo.setOutputnumber(code);
-                        JSONObject json = new JSONObject();
-                        json.put("batchNumber", code);
-                        //生成二维码
-                        String qrCode = QRCodeGenerator.stringToQRCodeBase64(json.toJSONString(), 200, 200, "png");
-                        apsReportOutputDo.setQrcode(qrCode);
+                            apsReportOutputDo.setOutputnumber(code);
+                            JSONObject json = new JSONObject();
+                            json.put("batchNumber", code);
+                            //生成二维码
+                            String qrCode = QRCodeGenerator.stringToQRCodeBase64(json.toJSONString(), 200, 200, "png");
+                            apsReportOutputDo.setQrcode(qrCode);
 
-                        apsReportOutputDo.setId(SecurityUtil.getUUID());
-                        apsReportOutputDo.setThickness(apsProcessOperationOutMaterDo.getThickness());
-                        apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
-                        apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
-                        apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
-                        apsReportOutputDo.setInsepctionlevel(insepctionLevel);
-                        apsReportOutputDo.setQualified(qualified);
-                        resList.add(apsReportOutputDo);
+                            apsReportOutputDo.setId(SecurityUtil.getUUID());
+                            apsReportOutputDo.setThickness(apsProcessOperationOutMaterDo.getThickness());
+                            apsReportOutputDo.setWidth(apsProcessOperationOutMaterDo.getProwidth());
+                            apsReportOutputDo.setLength(apsProcessOperationOutMaterDo.getProlength());
+                            apsReportOutputDo.setWeight(apsProcessOperationOutMaterDo.getSinglerollweight());
+                            apsReportOutputDo.setInsepctionlevel(insepctionLevel);
+                            apsReportOutputDo.setQualified(qualified);
+                            resList.add(apsReportOutputDo);
+                        }
                     }
                 }
             }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -249,6 +249,16 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             if (ObjectUtil.isNotEmpty(equDo.getPreviousprocessesids()) && ObjectUtil.isNotEmpty(recordsDo.getBatchnumber())) {
                 apsProcessOperationDao.updateBatchNumberByPrevious(recordsDo.getBatchnumber(), equDo.getPreviousprocessesids());
             }
+            /**
+             * 如果该工序作业明细没有前道工序作业明细，则该作业明细对应作业的所有作业明细的待加工料卷批次号加上“{批次号}，”
+             */
+            if (ObjectUtil.isEmpty(equDo.getPreviousprocessesids()) && ObjectUtil.isNotEmpty(recordsDo.getBatchnumber())) {
+                //更新坯料计划的第一道工序作业的所有工序作业明细的待加工料卷批次号=领料批次号逗号拼接
+                apsProcessOperationProcessEquService.update(new UpdateWrapper<ApsProcessOperationProcessEquDo>().lambda()
+                        .setSql("BACHMATERIALPROCESS = IF(BACHMATERIALPROCESS is null || BACHMATERIALPROCESS = '','" + String.join(",", batchNumberList) + "',CONCAT(BACHMATERIALPROCESS,'," + String.join(",", batchNumberList) + "'))")
+                        .eq(ApsProcessOperationProcessEquDo::getDeleted, "0")
+                        .eq(ApsProcessOperationProcessEquDo::getProcessid, recordsDo.getProcessoperationid()));
+            }
         }
         set.eq(ApsProcessOperationProcessEquDo::getId, equDo.getId());
         apsProcessOperationProcessEquService.update(set);
@@ -307,6 +317,11 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
 
         //根据作业明细ID查询作业明细详情
         ApsProcessOperationProcessEquDo apsProcessOperationProcessEquDo = apsProcessOperationProcessEquService.getById(req.getUseDeviceId());
+        //如果已开工卷数！= 已报工卷数，说明已经开工了，提示已开工
+        if (!apsProcessOperationProcessEquDo.getStartingroll().equals(apsProcessOperationProcessEquDo.getReportroll())) {
+            return R.error("此作业已开工，请刷新列表后重试");
+        }
+
         //查询工序作业的详情
         ApsProcessOperationDo apsProcessOperationDo = apsProcessOperationService.getById(apsProcessOperationProcessEquDo.getProcessid());
         //查询坯料计划的详情
@@ -516,7 +531,9 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                     }
                 }
                 //更新
-                apsProcessOperationProcessEquService.updateBatchById(updateList);
+                if (ObjectUtil.isNotEmpty(updateList)) {
+                    apsProcessOperationProcessEquService.updateBatchById(updateList);
+                }
             }
         }
 
@@ -714,6 +731,12 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
     public R saveReport(SaveReportReq req) {
         //报工主表
         ApsReportRecordsDo apsReportRecordsDo = req.getApsReportRecordsDo();
+        //防止同时报工
+        ApsReportRecordsDo recordsDo = this.getById(apsReportRecordsDo.getId());
+        if (ObjectUtil.isEmpty(recordsDo) || !recordsDo.getReportworkstatus().equals("已开工")) {
+            return R.error("此作业已取消开工或已报工，请刷新列表后重试");
+        }
+
         //报工输出物料
         List<ApsReportOutputDo> apsReportOutputDoList = req.getApsReportOutputDoList();
         //报工加工参数
@@ -1079,6 +1102,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
                         && !CXCommonUtils.removeExtraZerosAndDecimal(apsProcessOperationOutMaterDo.getProlength()).equals("0")) {
                     outPut = outPut + "*长" + CXCommonUtils.removeExtraZerosAndDecimal(apsProcessOperationOutMaterDo.getProlength());
                 }
+//                outPut = outPut + " " + CXCommonUtils.removeExtraZerosAndDecimal(apsProcessOperationOutMaterDo.getSinglerollweight()) + "吨";
             } catch (Exception ignored) {
             }
             workInProgressInventoryDo.setJoboutputmaterial(outPut);