打包 编码规则 策略变更 流水号递增不使用零件维度

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/YfaiPackageNumberRuleStrategyService.java

@@ -33,7 +33,7 @@ public class YfaiPackageNumberRuleStrategyService implements INumberRulePackAttr
 //|   {SPILTRULE}
 //C901  {ORG}
 //|   {SPILTRULE}
-//401007574AAABN  {PARTNO}
+//401007574AAABN  {PARTNO}  -----  20250612调整 wms会扫描 packageOneCode, 这个里面没有零件号, 所以变更 此段内容 为 {DYNAMICRULE}
 //|  {SPILTRULE}
 //9.0 {DYNAMICRULE} 标包 一位小数
 //|  {SPILTRULE}
@@ -45,6 +45,7 @@ public class YfaiPackageNumberRuleStrategyService implements INumberRulePackAttr
 //| {SPILTRULE}
 
     private final static String DR_QTY = "DR_QTY";
+    private final static String DR_PARTNO = "DR_PARTNO";
 
     @Override
     public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) {
@@ -59,6 +60,7 @@ public class YfaiPackageNumberRuleStrategyService implements INumberRulePackAttr
         genSerialNoModel.setDynamicRule(
                 new StringJoiner(MesPcnExtConstWords.COMMA)
                         .add(((new SimpleDateFormat(MesPcnExtConstWords.DATE_FORMAT_SHORT)).format(new Date())))
+                        .add(DR_PARTNO)
                         //.add(String.format("%.1f", qty))
                         .add(DR_QTY)
                         .add(unit)
@@ -87,6 +89,7 @@ public class YfaiPackageNumberRuleStrategyService implements INumberRulePackAttr
         Double qty = (!CollectionUtils.isEmpty(dataMap) && dataMap.containsKey(MesPcnExtConstWords.QTY)) ? (Double) dataMap.get(MesPcnExtConstWords.QTY) : null;
         if (StringUtils.isEmpty(qty)) qty = null != packageRuleContext ? packageRuleContext.getPackSpecQty() : new Double(1);
         serialNo = serialNo.replace(DR_QTY, String.format("%.1f", qty));
+        serialNo = serialNo.replace(DR_PARTNO, genSerialNoModel.getPartNo());
         genSerialNoModel.putDataMap(serialNo, packageOneCode);
         return serialNo;
     }