Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java

@@ -237,7 +237,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                 }
 
                 scanFlg = true;
-                detail.setBarcode(produceSn.getSerialNumber());
+                detail.setBarcode(produceSn.getProductSn());
 
                 if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) {
                     detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER);
@@ -367,6 +367,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             //封装信息
             produceSn = new MesProduceSn();
             produceSn.setSerialNumber(model.getSn());
+            produceSn.setProductSn(model.getSn());
             produceSn.setPartNo(mesShippingOrderManagementDetail.getPartNo());
         }
 
@@ -497,26 +498,23 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
             ConvertBean.serviceModelUpdate(vehiclesOrderDetail, userInfo);
             vehiclesOrderDetailRepository.save(vehiclesOrderDetail);
         }
-
+        if(StringUtils.isEmpty(orderManagement.getOrderCode())){
+            //保存当前发运单明细报工
+            jisShippingRepository.saveAll(getMesJisShippings(organizeCode, orderManagement));
+        }else{
             DdlPackBean orderManagementPackBean = DdlPackBean.getDdlPackBean(organizeCode);
             DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", orderManagementPackBean);
             DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue(), "status", orderManagementPackBean);
             boolean exitByHql = shippingOrderManagementRepository.isExitByHql(orderManagementPackBean);
             //2.装车单中所有发运单全部变成发运回传
             if(!exitByHql){
-            List<MesJisShipping> jisShippingList=new ArrayList<>();
                 DdlPackBean jisBean = DdlPackBean.getDdlPackBean(organizeCode);
                 DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", jisBean);
                 List<MesShippingOrderManagement> shippingOrderManagementList = shippingOrderManagementRepository.findByHqlWhere(jisBean);
                 for (MesShippingOrderManagement mesShippingOrderManagement : shippingOrderManagementList) {
-                DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-                DdlPreparedPack.getNumEqualPack(mesShippingOrderManagement.getId(), "pid", detailPackBean);
-                List<MesShippingOrderManagementDetail> shippingOrderManagementDetails = shippingOrderManagementDetailRepository.findByHqlWhere(detailPackBean);
-                //当前装车单所有发运单明细 需要报工的数据
-                jisShippingList = jisShippingService.getJisShipping(mesShippingOrderManagement, shippingOrderManagementDetails, organizeCode);
-            }
                     //保存当前发运单明细报工
-            jisShippingRepository.saveAll(jisShippingList);
+                    jisShippingRepository.saveAll(getMesJisShippings(organizeCode, mesShippingOrderManagement));
+                }
 
                 if(!StringUtil.isEmpty(vehiclesOrderDetail)){
                     MesLoadingList loadingList = vehiclesOrderRepository.getById(vehiclesOrderDetail.getPid());
@@ -526,11 +524,19 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
                         shippingLoadingCheckService.update(loadingList);
                     }
                 }
-
+            }
+        }
 
     }
 
+    private List<MesJisShipping> getMesJisShippings(String organizeCode, MesShippingOrderManagement mesShippingOrderManagement) {
+        DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getNumEqualPack(mesShippingOrderManagement.getId(), "pid", detailPackBean);
+        List<MesShippingOrderManagementDetail> shippingOrderManagementDetails = shippingOrderManagementDetailRepository.findByHqlWhere(detailPackBean);
+        //当前装车单所有发运单明细 需要报工的数据
+        return jisShippingService.getJisShipping(mesShippingOrderManagement, shippingOrderManagementDetails, organizeCode);
     }
+
     @Override
     @MonitorLog
     public void update(MesShippingOrderManagement item) {

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

@@ -73,7 +73,7 @@ public class GqxnyNumberRuleStrategyService implements INumberRulePackAttributeS
     }
 
     private String stringFormat(String data, Integer length) {
-        return stringFormat(data, length, true, MesPcnExtConstWords.ASTERISK);
+        return stringFormat(data, length, true, MesPcnExtConstWords.SEPARATOR);
     }
 
     private String stringFormat(String data, Integer length, boolean left, String symbol) {

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java

@@ -272,6 +272,8 @@ public class MesPcnExtConstWords {
     // *
     public static final String ASTERISK = "*";
 
+    public static final String SEPARATOR = "-";
+
 
 
     //过程条码默认生成规则