From a5eef7febd7f5123dfb6551327bc49c6573b7254 Mon Sep 17 00:00:00 2001
From: "castle.zang" <castle.zang@estsh.com>
Date: Sun, 29 Sep 2024 15:56:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=B0=91=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/roundness/MesPackageRoundnessService.java | 30 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
index 9d086dc..e028608 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
@@ -186,7 +186,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
 
         String organizeCode = partProdGroup.getOrganizeCode();
         MesWorkOrder mesWorkOrder = new MesWorkOrder();
-
+        mesWorkOrder.setCustCode(partProdGroup.getCustCode());
         //工单版本号
         mesWorkOrder.setProductVersion("1");
         //工单类型
@@ -282,8 +282,8 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
 
         mesWorkOrder.setPartProdGroupCode(partProdGroup.getPartProdGroupCode());
         mesWorkOrder.setCarModelCode(sortInfo.getVehicleNo());
-
-
+        mesWorkOrder.setFid(UUID.randomUUID().toString());
+        mesWorkOrder.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue());
         /**
          * RS 为记录分隔符ASCII:30
          * GS 为分组符ASCII:29
@@ -332,7 +332,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         custGenSerialNoModel.setPartNo(prefix+partNo4);
         String year = custCalendar.get(Calendar.YEAR)+"";
         custGenSerialNoModel.setYear(year.substring(2));
-        custGenSerialNoModel.setDay(custCalendar.get(Calendar.DAY_OF_YEAR)+"");
+        custGenSerialNoModel.setDay(String.format("%03d",custCalendar.get(Calendar.DAY_OF_YEAR)));
         List<String> custNumRuleList = syncFuncService.syncSerialNo(custGenSerialNoModel, "edi", organizeCode, 1).getResultList();
         // [)>%RS%06%GS%Y,4110000000000X,%GS%P,%GS%12V,545238347,%GS%T1A,A2B4C,%RS%%EOT%
         //截取替换为ascii码
@@ -352,7 +352,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         String[] split2 = gsStr.toString().split("%EOT%");
         String sn =  split2[0]+(char)4;
         //保存条码
-        mesWorkOrder.setSn(sn);
+        mesWorkOrder.setCustSn(sn);
 
 
 
@@ -487,11 +487,13 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
                 mesQueueOrder.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
                 mesQueueOrder.setSerialNumber(mesWorkOrder.getWorkOrderNo());
                 mesQueueOrder.setProductSn(mesWorkOrder.getWorkOrderNo());
-                mesQueueOrder.setCustSn(mesWorkOrder.getSn());
+                mesQueueOrder.setCustSn(mesWorkOrder.getCustSn());
                 mesQueueOrder.setStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue());
                 mesQueueOrder.setProduceSeq(mesWorkOrder.getProduceSeq());
                 mesQueueOrder.setWorkOrderSeq(mesWorkOrder.getWorkOrderSeq());
                 mesQueueOrder.setCustPartNo(mesWorkOrder.getCustPartNo());
+                mesQueueOrder.setCustOrderNo(mesWorkOrder.getCustOrderNo());
+                mesQueueOrder.setWorkCenterCode(mesWorkOrder.getWorkCenterCode());
                 ConvertBean.saveOrUpdate(mesQueueOrder, "MES-JOB");
                 queueOrderRao.insert(mesQueueOrder);
             }
@@ -501,9 +503,23 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
         //生成条码表
         MesProduceSn mesProduceSn = new MesProduceSn();
         mesProduceSn.setProductSn(mesWorkOrder.getWorkOrderNo());
-        mesProduceSn.setCustSn(mesWorkOrder.getSn());
+        mesProduceSn.setCustSn(mesWorkOrder.getCustSn());
         mesProduceSn.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
         mesProduceSn.setOrganizeCode(organizeCode);
+        mesProduceSn.setFid(UUID.randomUUID().toString());
+        mesProduceSn.setCustCode(mesWorkOrder.getCustCode());
+        mesProduceSn.setCustPartNo(mesWorkOrder.getCustPartNo());
+        mesProduceSn.setPartNo(mesWorkOrder.getPartNo());
+        mesProduceSn.setPartName(mesWorkOrder.getPartName());
+        mesProduceSn.setShiftCode(mesWorkOrder.getShiftCode());
+        mesProduceSn.setWorkCenterCode(mesWorkOrder.getWorkCenterCode());
+        mesProduceSn.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue());
+        mesProduceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue());
+        mesProduceSn.setQty(1.0);
+        mesProduceSn.setSerialNumber(mesWorkOrder.getWorkOrderNo());
+        mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue());
+        mesProduceSn.setSnType(MesExtEnumUtil.PRODUCE_SN_TYPE.STANDARD.getValue());
+        mesProduceSn.setFid(UUID.randomUUID().toString());
         ConvertBean.saveOrUpdate(mesProduceSn, "MES-JOB");
         mesProduceSnRao.insert(mesProduceSn);