aps-坯料计划增加行按钮领料功能

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

@@ -3104,7 +3104,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                 //如果{该批次号物料的输入物料描述}与{坯料的输入物料描述}不相同，
                 //错误提示：该批次号{批次号}物料：{该批次号物料的输入物料描述}不是该坯料计划所需的坯料{坯料的输入物料描述}
                 String s1 = apsWorkInProgressInventoryDo.getJoboutputmaterial();
-                String s2 = apsBlankOrderDo.getInputreportdescribe() + " " + CXCommonUtils.removeExtraZerosAndDecimal(apsBlankOrderDo.getSinglerollweight()) + "吨";
+                String s2 = apsBlankOrderDo.getInputreportdescribe();
                 if (!s1.equals(s2)) {
                     return R.error("该批次号" + s + "物料：" + s1 + "不是该坯料计划所需的坯料" + s2 + "");
                 }

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

@@ -1091,7 +1091,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()) + "吨";
+//                outPut = outPut + " " + CXCommonUtils.removeExtraZerosAndDecimal(apsProcessOperationOutMaterDo.getSinglerollweight()) + "吨";
             } catch (Exception ignored) {
             }
             workInProgressInventoryDo.setJoboutputmaterial(outPut);