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/roundness/MesPackageRoundnessService.java

@@ -452,6 +452,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         List<String> proSeqResultList = syncFuncService.syncSerialNo(prodSeqSerialNoModel.organizeCode(organizeCode), "edi", mesPartProdGroupDetail.getOrganizeCode(), 1).getResultList();
         String proSeqStr = proSeqResultList.get(0);
         mesWorkOrder.setProduceSeq(Long.parseLong(proSeqStr.replace(organizeCode, "").replace(mesWorkOrder.getWorkCenterCode(),"")));
+        mesWorkOrder.setPartProdGroupName(partProdGroup.getPartProdGroupName());
         ConvertBean.saveOrUpdate(mesWorkOrder, "MES-JOB");
         mesWorkOrderRao.insert(mesWorkOrder);
 
@@ -556,6 +557,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
             orderAssembly.setShowColor(sortCfg.getShowColor());
             orderAssembly.setProductPartNo(sortCfg.getProductPartNo());
             orderAssembly.setPid(sortCfg.getId());
+            orderAssembly.setWorkCenterCode(workCenterCode);
             workOrderAssemblyList.add(orderAssembly);
         }