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

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPullDetailService.java

@@ -51,6 +51,7 @@ public class MesPartPullDetailService extends BaseMesService<MesPartPullDetail>
             DdlPreparedPack.getStringEqualPack(item.getPullCode(), "pullCode", partPackBean);
             DdlPreparedPack.getStringEqualPack(item.getPartNo(), "partNo", partPackBean);
             DdlPreparedPack.getStringEqualPack(item.getWorkCellCode(), "workCellCode", partPackBean);
+            DdlPreparedPack.getNumNOEqualPack(item.getId(),"id",partPackBean);
             boolean flg = baseRDao.isExitByHql(partPackBean);
             if (flg) {
                 throw ImppExceptionBuilder.newInstance()

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java

@@ -245,6 +245,7 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
                         pullingOrderPartInfo.setColor(MesExtEnumUtil.PART_PULL_DETAIL_COLOR.RED.getCode());
                     }
                     pullingOrderPartInfo.setCarSeries(partInfo.getCarSeries());
+                    pullingOrderPartInfo.setOrderFlag(pullingOrder.getOrderFlag());
 
                     ConvertBean.serviceModelInitialize(pullingOrderPartInfo, userName);
                     mesPullingOrderPartInfoRepository.insert(pullingOrderPartInfo);

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/AssemblyVisualListPrintStrategy.java

@@ -63,7 +63,7 @@ public class AssemblyVisualListPrintStrategy implements IPrintTemplateStrategySe
         // 客户零件号
         resultMap.put(MesExtConstWords.CUST_PART_NO, workOrder.getPartNo());
         // 客户条码
-        resultMap.put(MesExtConstWords.SN, workOrder.getSn());
+        resultMap.put(MesExtConstWords.SN, workOrder.getCustSn());
         // 备注
         resultMap.put(MesExtConstWords.REMARK, customerCarModel == null ? "" : customerCarModel.getRemark());
         // 重打印