From f396cef18cacf1867c279f5b59eb975673d2c243 Mon Sep 17 00:00:00 2001
From: "castle.zang" <castle.zang@estsh.com>
Date: Fri, 19 Jul 2024 15:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E6=9D=A1=E7=A0=81=E4=B9=9F?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=B7=BB=E5=8A=A0=E7=AE=80=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NoSortBarcodeGzNumberRuleStrategyService.java  | 31 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/NoSortBarcodeGzNumberRuleStrategyService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/NoSortBarcodeGzNumberRuleStrategyService.java
index 069bc10..44befd9 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/NoSortBarcodeGzNumberRuleStrategyService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/NoSortBarcodeGzNumberRuleStrategyService.java
@@ -1,9 +1,15 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.numberrule;
 
 import cn.estsh.i3plus.mes.pcn.api.iservice.busi.INumberRulePackAttributeStrategyService;
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
 import cn.estsh.i3plus.pojo.mes.model.GenSerialNoModel;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+import java.util.Map;
+
 /**
  * @Description :
  * @Reference :
@@ -15,13 +21,24 @@ import org.springframework.stereotype.Component;
 public class NoSortBarcodeGzNumberRuleStrategyService implements INumberRulePackAttributeStrategyService {
     @Override
     public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) {
-        //{partNo}{year}{month}{day}{serialNo}
-        //内部条码, 批量打印 NoSortBarCodeGZ
-        //零件号 partNo
-//        GenSerialNoModel genSerialNoModel = new GenSerialNoModel();
-//        genSerialNoModel.setRuleCode(numberRule.getRuleCode());
-//        genSerialNoModel.setPartNo(partNo);
-
+        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_SHORT.valueOfDescription(Integer.parseInt(TimeTool.getYear(date)));
+    }
+
+    private String getMonthShort(Date date) {
+
+        return MesExtEnumUtil.MONTH_SHORT.valueOfDescription(Integer.parseInt(TimeTool.getMonth(date)));
+    }
+
+    private String getDayShort(Date date) {
+        return TimeTool.getDay(date);
+    }
 }