Merge branch 'master' of http://123.57.213.14:3001/zgzt/dosb-sys-java

# Conflicts:
#	zgzt-sys-java/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/entity/BilletHotsend.java

@@ -130,6 +130,10 @@ public class BilletHotsend implements Serializable {
     @Excel(name = "判废支数", width = 15)
     @ApiModelProperty(value = "判废支数")
     private Integer wasteNum;
+    /**叛废总重*/
+    @Excel(name = "叛废总重", width = 15)
+    @ApiModelProperty(value = "叛废总重")
+    private Double wasteBlankOutput;
     /**C*/
     @Excel(name = "C", width = 15)
     @ApiModelProperty(value = "C")

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/entity/BilletHotsendChangeShift.java

@@ -79,6 +79,10 @@ public class BilletHotsendChangeShift implements Serializable {
 	@Excel(name = "当前废品支数", width = 15)
     @ApiModelProperty(value = "当前废品支数")
     private Integer wasteAmount;
+    /**叛废总重*/
+    @Excel(name = "叛废总重", width = 15)
+    @ApiModelProperty(value = "叛废总重")
+    private Double wasteBlankOutput;
 	/**当前热送支数*/
 	@Excel(name = "当前热送支数", width = 15)
     @ApiModelProperty(value = "当前热送支数")

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletBasicInfoServiceImpl.java

@@ -136,6 +136,7 @@ public class BilletBasicInfoServiceImpl extends ServiceImpl<BilletBasicInfoMappe
                 billetHotsend.setAmountTotal(1); // 支数
                 billetHotsend.setBlankOutput(weight); // 出批量
                 billetHotsend.setDecideWeight(billetBasicInfo.getWeight()); // 定重
+                billetHotsend.setWasteBlankOutput(0.0);
                 billetHotsendMapper.insert(billetHotsend);
             }
         }

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletHotsendBaseServiceImpl.java

@@ -1073,18 +1073,35 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
 			storageBillInfo.setSize(finalSizeString);
 		}
 
-		List<String> stringList = billetBasicInfoList.stream().map(BilletBasicInfo::getAssemblyNumber).filter(assemblyNumber -> oConvertUtils.isNotEmpty(assemblyNumber)).collect(Collectors.toList());
-		if(oConvertUtils.listIsNotEmpty(stringList)) {
-			String distinctAssemblyNumber = billetBasicInfoList.stream()
-					.map(BilletBasicInfo::getAssemblyNumber)
-					.filter(assemblyNumber -> oConvertUtils.isNotEmpty(assemblyNumber))
-					.distinct().collect(Collectors.joining(","));
-			String finalAssemblyNumber = Optional.ofNullable(storageBillInfo.getAssemblyNumber())
+		List<String> stringList = billetBasicInfoList.stream()
+				.map(BilletBasicInfo::getAssemblyNumber)
+				.filter(oConvertUtils::isNotEmpty)
+				.collect(Collectors.toList());
+
+		if (oConvertUtils.listIsNotEmpty(stringList)) {
+			Set<String> assemblyNumberSet = new LinkedHashSet<>();
+
+			// 处理旧的 assemblyNumber（直接按照英文逗号 , 拆分）
+			String oldAssemblyNumber = storageBillInfo.getAssemblyNumber();
+			if (oConvertUtils.isNotEmpty(oldAssemblyNumber)) {
+				Arrays.stream(oldAssemblyNumber.split(","))
+						.map(String::trim)
+						.filter(oConvertUtils::isNotEmpty)
+						.forEach(assemblyNumberSet::add);
+			}
+
+			// 处理新的 assemblyNumber（也是英文逗号）
+			stringList.stream()
+					.flatMap(s -> Arrays.stream(s.split(",")))
+					.map(String::trim)
 					.filter(oConvertUtils::isNotEmpty)
-					.map(s -> s + "," + distinctAssemblyNumber)
-					.orElse(distinctAssemblyNumber);
-			storageBillInfo.setAssemblyNumber(finalAssemblyNumber);
+					.forEach(assemblyNumberSet::add);
+
+			// 最后重新赋值
+			storageBillInfo.setAssemblyNumber(String.join(",", assemblyNumberSet));
 		}
+
+
 		storageBillInfo.setBtype("0");
 		storageBillService.updateById(storageBillInfo);
 

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletHotsendChangeShiftServiceImpl.java

@@ -267,6 +267,7 @@ public class BilletHotsendChangeShiftServiceImpl extends ServiceImpl<BilletHotse
             billetHotsendChangeShift1.setShiftSum(0); // 当班总数
             billetHotsendChangeShift1.setShiftProduct(0d); // 当班总重
             billetHotsendChangeShift1.setWasteAmount(0); // 当前废品支数
+            billetHotsendChangeShift1.setWasteBlankOutput(0d);
             billetHotsendChangeShift1.setCreateTime(new Date());
             // 3.19 新增班次实绩
             billetHotsendChangeShift1.setShiftHotsendAmount(0);
@@ -388,6 +389,7 @@ public class BilletHotsendChangeShiftServiceImpl extends ServiceImpl<BilletHotse
             billetHotsendChangeShift1.setShiftSum(0); // 当班总数
             billetHotsendChangeShift1.setShiftProduct(0d); // 当班总重
             billetHotsendChangeShift1.setWasteAmount(0); // 当前废品支数
+            billetHotsendChangeShift1.setWasteBlankOutput(0d);// 当前废品总重量
             billetHotsendChangeShift1.setCreateTime(new Date());
             // 3.19 新增班次实绩
             billetHotsendChangeShift1.setShiftHotsendAmount(0);

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/storageBill/entity/StorageBill.java

@@ -189,4 +189,13 @@ public class StorageBill implements Serializable {
     @ApiModelProperty(value = "新站台or旧站台（0 新站台 1 旧站台）")
     private Integer newOldPlatform;
 
+
+    /**
+     * 确认支数时间
+     */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "确认支数时间")
+    private Date confirmNumTime;
+
 }

zgzt-sys-java/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -172,9 +172,9 @@ spring:
           slow-sql-millis: 5000
       datasource:
         master:
-          url: jdbc:mysql://123.57.213.14:33066/lg_0416?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-#          url: jdbc:mysql://127.0.0.1/lg?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: root
+#          url: jdbc:mysql://192.168.1.53/lg_0416?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1/lg?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: lg
           password: 1qaz2wsx@..
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置