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; + } } 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 520d956..32fd382 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 @@ -2060,7 +2060,10 @@ public class MesEnumUtil { MES_LOCATION(570, "locationExcelService", "库位信息导入"), MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"), MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入"), - MES_SPARE_PARTS(600, "sparePartsExcelService", "备件计划导入"); + MES_MODEL_GRADE(600, "modelGradeExcelService", "车型等级导入"), + MES_PROD_MODEL_CFG(610, "prodModelCfgExcelService", "产品车型配置导入"), + MES_SCATTER_PART_CFG_BOM(620, "scatterPartCfgBomExcelService", "车型散件配置清单导入"), + MES_SPARE_PARTS(630, "sparePartsExcelService", "备件计划导入"); private int value; private String service; @@ -3689,6 +3692,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, "未打印"), 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() { } 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;