Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-svr into liweidong

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/WorkOrderRunServiceImpl.java

@@ -768,7 +768,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
 
         // 查找外协订单的第一道工序
         WorkPlan deliverablePlan = workPlans.stream()
-                .max(Comparator.comparing(WorkPlan::getOrders))
+                .min(Comparator.comparing(WorkPlan::getOrders))
                 .orElse(null);
         if (deliverablePlan == null) {
             return R.fail("未找到外协第一道工序！");
@@ -781,7 +781,7 @@ public class WorkOrderRunServiceImpl extends BaseServiceImpl<WorkOrderRunMapper,
         workPlans.forEach(workPlan -> {
             workPlan.setOcId(ocId);
         });
-        List<BatchResult> batchResults = workPlanMapper.insertOrUpdate(workPlans);
+        List<BatchResult> batchResults = workPlanMapper.updateById(workPlans);
         // todo:qyl 2.在MES更改后同步给ERP
 
         return null;

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGlassCakeOutServiceImpl.java

@@ -166,7 +166,15 @@ public class StGlassCakeOutServiceImpl extends BaseServiceImpl<StGlassCakeOutMap
 		int lastNum = 0;
 		if (StrUtil.isNotBlank(maxCode)) {
 			String number = maxCode.substring(datePrefix.length());
-			lastNum = Integer.parseInt(number);
+			String[] arr = number.split("-");
+			// 防止没有"-"导致数组空
+			if(arr.length >= 1){
+				String realNum = arr[0];
+				// 只有全数字才转整型
+				if(StrUtil.isNumeric(realNum)){
+					lastNum = Integer.parseInt(realNum);
+				}
+			}
 		}
 
         // 4. 遍历每个玻璃饼，单独匹配库存+判断是否生成预出库

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StGraphiteMoldOutServiceImpl.java

@@ -142,12 +142,17 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMold
 		if (StrUtil.isNotBlank(maxCode)) {
 			String number = maxCode.substring(datePrefix.length());
 			String[] arr = number.split("-");
-			String realNum = arr[0];
+			// 防止没有"-"导致数组空
-			if(StrUtil.isNumeric(realNum)){
+			if(arr.length >= 1){
-				lastNum = Integer.parseInt(realNum);
+				String realNum = arr[0];
+				// 只有全数字才转整型
+				if(StrUtil.isNumeric(realNum)){
+					lastNum = Integer.parseInt(realNum);
+				}
 			}
 		}
 		int childNum = 1;
+		lastNum++;
 
 		// 遍历每个子件
 		for (DsPartEntity subItem : allChildPartList) {
@@ -178,7 +183,6 @@ public class StGraphiteMoldOutServiceImpl extends BaseServiceImpl<StGraphiteMold
 				preOutStock.setYoCode(faYieldOrder.getYoCode());
 				preOutStock.setCardNo(dto.getCardNo());
 
-				lastNum++;
 				String parentOutCode = datePrefix + StrUtil.padPre(String.valueOf(lastNum), 4, '0');
 				preOutStock.setParentOutCode(parentOutCode);
 				String outCode = parentOutCode + "-" + childNum;

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java

@@ -246,7 +246,15 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
 			int lastNum = 0;
 			if (StrUtil.isNotBlank(maxCode)) {
 				String number = maxCode.substring(datePrefix.length());
-				lastNum = Integer.parseInt(number);
+				String[] arr = number.split("-");
+				// 防止没有"-"导致数组空
+				if(arr.length >= 1){
+					String realNum = arr[0];
+					// 只有全数字才转整型
+					if(StrUtil.isNumeric(realNum)){
+						lastNum = Integer.parseInt(realNum);
+					}
+				}
 			}
 
 			// ========== 1.3 组装所有商品明细 ==========

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java

@@ -116,7 +116,15 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
 		int lastNum = 0;
 		if (StrUtil.isNotBlank(maxCode)) {
 			String number = maxCode.substring(datePrefix.length());
-			lastNum = Integer.parseInt(number);
+			String[] arr = number.split("-");
+			// 防止没有"-"导致数组空
+			if(arr.length >= 1){
+				String realNum = arr[0];
+				// 只有全数字才转整型
+				if(StrUtil.isNumeric(realNum)){
+					lastNum = Integer.parseInt(realNum);
+				}
+			}
 		}
 		// 主账单字段 = 明细合计
 		for (StStockInoutRecord detail : inoutList) {

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StStockInoutRecordServiceImpl.java

@@ -86,7 +86,15 @@ public class StStockInoutRecordServiceImpl extends BaseServiceImpl<StStockInoutR
 		int lastNum = 0;
 		if (StrUtil.isNotBlank(maxCode)) {
 			String number = maxCode.substring(datePrefix.length());
-			lastNum = Integer.parseInt(number);
+			String[] arr = number.split("-");
+			// 防止没有"-"导致数组空
+			if(arr.length >= 1){
+				String realNum = arr[0];
+				// 只有全数字才转整型
+				if(StrUtil.isNumeric(realNum)){
+					lastNum = Integer.parseInt(realNum);
+				}
+			}
 		}
 		// 3. 补零拼接
 		return datePrefix + StrUtil.padPre(String.valueOf(++lastNum), 4, '0');