Merge remote-tracking branch 'origin/uat-temp-wj-chongqingdaqu-dev' into uat-temp-wj-chongqingdaqu-dev

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule;
+
+import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
+import cn.estsh.i3plus.mes.pcn.api.iservice.busi.INumberRulePackAttributeStrategyService;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
+import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
+import cn.estsh.i3plus.pojo.mes.repository.MesCustomerPartRepository;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import java.util.Date;
+import java.util.Map;
+
+@Component
+public class XiaoPengNumberRule2StrategyService implements INumberRulePackAttributeStrategyService {
+
+    @Autowired
+    private MesCustomerPartRepository customerPartRepository;
+
+    @Override
+    public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) {
+
+        Map<String, Object> dataMap = genSerialNoModel.getDataMap();
+        MesCustomerPart customerPart = (!CollectionUtils.isEmpty(dataMap) && dataMap.containsKey(MesCustomerPart.class.getSimpleName())) ?
+                (MesCustomerPart)dataMap.get(MesCustomerPart.class.getSimpleName()) : getMesCustomerPart(genSerialNoModel.getOrganizeCode(), genSerialNoModel.getPartNo());
+        if (null != customerPart) {
+            genSerialNoModel.setCustPartNo(customerPart.getCustPartNo());
+        }else {
+            MesPcnException.throwMesBusiException("请检查客户零件信息,零件[%s]客户零件关系未维护", genSerialNoModel.getPartNo());
+        }
+
+        //年月日缩写
+        Date date = new Date();
+        genSerialNoModel.setYear(getYearShort(date));
+        genSerialNoModel.setMonth(getMonthShort(date));
+        genSerialNoModel.setDay(getDayShort(date));
+        return genSerialNoModel;
+    }
+
+    private String getYearShort(Date date) {
+        return MesExtEnumUtil.YEAR_SHORT2.valueOfDescription(Integer.parseInt(TimeTool.getYear(date)));
+    }
+
+    private String getMonthShort(Date date) {
+        return MesExtEnumUtil.MONTH_SHORT2.valueOfDescription(Integer.parseInt(TimeTool.getMonth(date)));
+    }
+
+    private String getDayShort(Date date) {
+        return MesExtEnumUtil.DAY_SHORT2.valueOfDescription(Integer.parseInt(TimeTool.getDay(date)));
+    }
+
+    private MesCustomerPart getMesCustomerPart(String orgaizeCode, String partNo) {
+        if (StringUtils.isEmpty(orgaizeCode) || StringUtils.isEmpty(partNo)) return null;
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(orgaizeCode);
+        DdlPreparedPack.getStringEqualPack(partNo, MesPcnExtConstWords.ERP_PART_NO, ddlPackBean);
+        MesCustomerPart customerPart = customerPartRepository.getByProperty(ddlPackBean);
+        return customerPart;
+    }
+
+}

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

@@ -38,7 +38,7 @@ import java.util.List;
  **/
 @Component
 @Slf4j
-public class ChengDuVolvoShippingPrintStrategyService implements IPrintTemplateStrategyService {
+public class ChengDuVolvoShippingPrintStrategyService extends SortShippingDispatchStrategyService implements IPrintTemplateStrategyService {
     @Autowired
     private MesShippingOrderManagementDetailRepository shippingOrderDetailRDao;
     @Autowired
@@ -53,6 +53,21 @@ public class ChengDuVolvoShippingPrintStrategyService implements IPrintTemplateS
     private IMesPartPackageTypeService partPackageTypeService;
 
     @Override
+    public List<MesShippingOrderManagement> getShippingOrderManagementList(MesShippingOrderManagement bean) {
+        return super.getShippingOrderManagementList(bean);
+    }
+
+    @Override
+    public List<MesShippingOrderManagementDetail> getShippingOrderManagementDetailList(String organizeCode, List<Long> idList, Object[] obj, String[] str) {
+        return super.getShippingOrderManagementDetailList(organizeCode, idList, obj, str);
+    }
+
+    @Override
+    public void saveShippingOrderManagementList(List<MesShippingOrderManagement> shippingOrderManagementList) {
+        super.saveShippingOrderManagementList(shippingOrderManagementList);
+    }
+
+    @Override
     public ResultBean execute(MesShippingOrderManagement bean, List<MesShippingOrderManagement> shippingOrderManagementList) {
         List<ChengDuVolvoShippingPrintModel> modelList = new ArrayList<>();
         for (MesShippingOrderManagement loadingList : shippingOrderManagementList) {

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesAssemblyShowNosortStepService.java

@@ -391,7 +391,6 @@ public class MesAssemblyShowNosortStepService extends BaseStepService {
                         return stepNonCompleteAndSendMsgReturn(reqBean, resultBean.writeDbLog().scanInfo(productionPsInContext.getProductSn()), stepResult, String.format("主条码[%s]零件号[%s]关联的加工单[%s]与产出零件[%s]关联的加工单[%s]不一致!",
                                 productionPsInContext.getProductSn(), productionPsInContext.getPartNo(), productionPsInContext.getWorkOrderNo(), productionPartContext.getPartNo(), productionPartContext.getWorkOrderNo()));
                     }
-
                     //进料存在工单且已经过某工序生产, 不能匹配无工单的产出零件
                     if (StringUtils.isEmpty(productionPartContext.getWorkOrderNo()) && !StringUtils.isEmpty(productionPsInContext.getWorkOrderNo()) && !StringUtils.isEmpty(productionPsInContext.getProcessCode())) {
                         if (productionPsInContext.getMessageSource().compareTo(MesExtEnumUtil.CELL_MESSAGE_SOURCE.SCAN.getValue()) == 0) productionPsInContext.busiCheckToDelete();