From 6f3f06a8f6bc2c7b8feddc16b579bd1b6f98cfde Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 10 Oct 2020 14:40:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?19048-=E6=9D=A1=E7=A0=81=E8=A1=A5=E6=89=93-?= =?UTF-8?q?=E8=A1=A5=E6=89=93=E5=8C=85=E8=A3=85=E9=9C=80=E8=A6=81=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=94=A8=E8=BF=87=E7=A8=8B=E6=9D=A1=E7=A0=81=E5=8F=8D?= =?UTF-8?q?=E6=9F=A5=E5=8C=85=E8=A3=85=E6=9D=A1=E7=A0=81-20201012?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index e1e09fd..34c8f2b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -163,6 +163,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("托包规数量") private Double qty2; + @Transient + @ApiParam("过程条码") + private String serialNumber; + public MesPackage() { } From 33c59cf39e75da6ac447cce5aca3db70eca6f929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 10 Oct 2020 14:59:08 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=9011654=20MES=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BC=BA=E5=B0=91=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=200928?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 7b07732..f739ff4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2055,7 +2055,10 @@ public class MesEnumUtil { MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"), MES_LOCATION(570, "locationExcelService", "库位信息导入"), MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"), - MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"); + MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"), + MES_MODEL_GRADE(600, "modelGradeExcelService", "车型等级导入"), + MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"), + MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"); private int value; private String service; From 1dbb826235ac70e0da7c4f81351c8e38cacce91b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 10 Oct 2020 15:58:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?19048-=E5=96=B7=E6=B6=82=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=90=8E=E6=9C=AA=E7=BB=99=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B5=8B=E5=80=BC-20201012?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 33 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 33 ++++++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index f739ff4..ffb33ec 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3687,6 +3687,39 @@ public class MesEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PRINT_STATUS { + + UNPRINTED(10, "未打印"), + PRINTED(20, "已打印"); + + private int value; + private String description; + + WORK_ORDER_PRINT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * MesProduceSn实体对应的printStatus值 条码表条码打印状态 */ diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 4fb7ac3..8e8a55f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2585,6 +2585,39 @@ public class MesPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_PRINT_STATUS { + + UNPRINTED(10, "未打印"), + PRINTED(20, "已打印"); + + private int value; + private String description; + + WORK_ORDER_PRINT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PACKAGE_PRINT_STATUS { UNPRINTED(10, "未打印"), From e97369585da1c6956b8a031f10a47feed456d8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 10 Oct 2020 17:10:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix(core):=E5=9C=A8=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E6=97=B6=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java index 0a4d24b..8420e4b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java @@ -106,6 +106,7 @@ public class BaseThreadLocal { public static final String INIT_INFO = "INIT_INFO"; //初始化数据 public static final String EMP_NAME = "USER_NAME"; //用户名 public static final String ORGANIZE_CODE = "ORGANIZE_CODE"; //组织代码 + public static final String LANGUAGE_CODE = "LANGUAGE_CODE"; //语言代码 public static boolean isInit(){ Object data = getData(INIT_INFO); @@ -117,9 +118,10 @@ public class BaseThreadLocal { } //初始化用户数据 - public static void initSessionUserThreadLocal(String empName, String organizeCode){ + public static void initSessionUserThreadLocal(String empName, String organizeCode,String languageCode){ setData(BaseThreadLocal.EMP_NAME, empName); setData(BaseThreadLocal.ORGANIZE_CODE, organizeCode); + setData(BaseThreadLocal.LANGUAGE_CODE, languageCode); setData(BaseThreadLocal.INIT_INFO, true); } @@ -139,4 +141,12 @@ public class BaseThreadLocal { } return organizeCode; } + //获取线程中的语言代码 + public static String getThreadLanguageCode(){ + String organizeCode = getDataStr(LANGUAGE_CODE); + if(organizeCode == null){ + organizeCode = "CN/zh"; + } + return organizeCode; + } } From c7e5524a0a794637c56343703f62d84c85da0b9e Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sun, 11 Oct 2020 14:34:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E4=BA=A7=E6=89=A3=E5=87=8F=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=89=A3=E5=87=8F=E6=9D=A1=E7=A0=81=E7=8A=B6=E6=80=81=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E4=B8=BA=E5=85=A5=E5=BA=93=EF=BC=8C=E5=90=88=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index bb34224..d6123bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -117,6 +117,14 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("司机") public String driverNo; + @Column(name = "TMS_CAR_NO") + @ApiParam(value = "TMS车牌号") + private String tmsCarNo; + + @Column(name = "TMS_DRIVER_NO") + @ApiParam("TMS司机") + public String tmsDriverNo; + @Column(name = "CUST_ORDER_NO") @ApiParam(value = "客户单号") private String custOrderNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 733c9d0..5c7fdeb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -77,6 +77,14 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("司机") public String driverNo; + @Column(name = "TMS_CAR_NO") + @ApiParam(value = "TMS车牌号") + private String tmsCarNo; + + @Column(name = "TMS_DRIVER_NO") + @ApiParam("TMS司机") + public String tmsDriverNo; + @Column(name="ITEM") @ApiParam(value = "行号") public String item;