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/ApsProcessOperationServiceImpl.java

@@ -1766,6 +1766,23 @@ public class ApsProcessOperationServiceImpl extends ServiceImpl<ApsProcessOperat
         boolean bool1 = apsProcessOperationService.saveOrUpdate(apsProcessOperationDo);
         boolean bool2 = apsProcessOperationOutMaterService.saveOrUpdateBatch(apsProcessOperationOutMaterDoNewList);
         if (bool1 && bool2) {
+            //更新坯料计划
+            apsBlankOrderService.update(new LambdaUpdateWrapper<ApsBlankOrderDo>()
+                    .eq(ApsBlankOrderDo::getId, blanckdata.getStr("ID"))
+                    .set(ApsBlankOrderDo::getProducttypeid, blanckdata.getStr("PRODUCTTYPEID"))
+                    .set(ApsBlankOrderDo::getProducttype, blanckdata.getStr("PRODUCTTYPE"))
+                    .set(ApsBlankOrderDo::getAlloy, blanckdata.getStr("ALLOY"))
+                    .set(ApsBlankOrderDo::getAlloystatus, blanckdata.getStr("ALLOYSTATUS"))
+                    .set(ApsBlankOrderDo::getThickness, blanckdata.getStr("THICKNESS") == "" ? null : blanckdata.getStr("THICKNESS"))
+                    .set(ApsBlankOrderDo::getProwidth, blanckdata.getStr("PROWIDTH") == "" ? null : blanckdata.getStr("PROWIDTH"))
+                    .set(ApsBlankOrderDo::getProlength, blanckdata.getStr("PROLENGTH") == "" ? null : blanckdata.getStr("PROLENGTH"))
+                    .set(ApsBlankOrderDo::getSinglerollweight, blanckdata.getStr("SINGLEROLLWEIGHT") == "" ? null : blanckdata.getStr("SINGLEROLLWEIGHT"))
+                    .set(ApsBlankOrderDo::getNumberunit, UNIT_MAP.getOrDefault(blanckdata.getStr("NUMBERUNIT"), ""))
+                    .set(ApsBlankOrderDo::getRollnum, blanckdata.getStr("ROLLNUM") == "" ? null : blanckdata.getStr("ROLLNUM"))
+                    .set(ApsBlankOrderDo::getTotalweight, blanckdata.getStr("TOTALWEIGHT") == "" ? null : blanckdata.getStr("TOTALWEIGHT"))
+                    .set(ApsBlankOrderDo::getInputreportdescribe, meterInput)
+            );
+
             //更新状态
             CommonUpdateProductionStatusReq req = new CommonUpdateProductionStatusReq();
             req.setProcessOperationId(blanckdata.getStr("ID"));