From 258c1ccbe8dfc2390bb17edc223e20f1755132f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Dec 2019 14:24:15 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=9A=E4=BC=98=E5=8C=96=E6=95=B0=E5=AD=97=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?CELL=E4=B8=BA=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E6=A0=A1=E9=AA=8C+=E6=9C=89=E4=BA=9BSHEET=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=E6=97=B6=E6=97=A0=E9=9C=80=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C+=E5=BF=AB=E9=80=9F=E7=A7=BB=E5=BA=93=EF=BC=9A?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E7=A7=BB=E5=85=A5=E5=BA=93=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E7=A0=81=EF=BC=9B=E4=B8=8D=E5=8F=AF=E5=A4=9A?= =?UTF-8?q?=E4=BA=BA=E6=93=8D=E4=BD=9C=E5=90=8C=E4=B8=80=E4=B8=AA=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E8=BF=9B=E8=A1=8C=E6=95=B4=E5=BA=93=E7=A7=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 -- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d6d917c..68528f9 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -981,7 +981,6 @@ public class WmsEnumUtil { /** * 业务表：库存条码状态 - * 10=创建，20=质检中，30=待入库，40=入库，50=配料，60=出库，70=报废，80=在途 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_STATUS { @@ -991,7 +990,6 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), - //SCRAP(70, "报废"), COMMING(80, "在途"); private int value; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 5878561..2926428 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -112,6 +112,7 @@ public class WmsActionGroupDetails extends BaseBean { @Column(name = "IS_AUTO_OPEN_WINDOW",nullable = false) @ApiParam(value = "是否自动开窗") + @AnnoOutputColumn private Integer isAutoOpenWindow; @Column(name = "SEARCH_KEY", columnDefinition = "varchar(225) default ''") From c5ae91b41e46559300db58f509a5c5767575db81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 16 Dec 2019 17:25:57 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E3=80=90KT-1286=20=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8B=89=E5=8A=A8-=E8=AE=A1=E5=88=92=E6=8B=89=E5=8A=A8JOB?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 +++++++++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d6d917c..de1b164 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4656,7 +4656,7 @@ public class WmsEnumUtil { } /** - * 计划拉动明细表状态创建 + * 计划拉动主表状态创建 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java index b2e4e34..0a41d3e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java @@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{ @Column(name="WROKORDER_NO") @ApiParam("工单号") - private String wrokorderNo; + private String woekorderNo; @Column(name="ITEM") @ApiParam(value = "行号", example = "0") @@ -107,7 +107,7 @@ public class WmsPullTaskDetails extends BaseBean{ private Double bootLotNo = 0d; @Column(name="ORDER_STATUS") - @ApiParam(value = "单据状态", example = "0") + @ApiParam(value = "明细状态", example = "0") private Integer orderStatus = 0; public Integer getOrderStatus() { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 17c8805..1f4fc92 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2618,7 +2618,18 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getInPack(statusList, "orderStatus", result); + List stringList = null; + List integerList = null; + //List integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList()); + if(StringUtils.isNotBlank(statusList)){ + stringList = Arrays.asList(statusList.split(",")); + integerList = new ArrayList<>(); + for(String sl : stringList){ + integerList.add(Integer.valueOf(sl)); + } + } + + DdlPreparedPack.getInPackList(integerList, "orderStatus", result); DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result); DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result); DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result); @@ -2637,7 +2648,7 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result); + DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result); DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result); getStringBuilderPack(wmsPullTaskDetails, result); From bc21d0b46116c7be10baaf4bc95c861d27cb0102 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 16 Dec 2019 18:55:32 +0800 Subject: [PATCH 03/20] =?UTF-8?q?task=20`1308`=201=20PCN=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=B5=84=E6=BA=90?= 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 | 3 ++- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) 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 efd4ce1..9846537 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 @@ -3568,7 +3568,8 @@ public class MesEnumUtil { PCN_LOGIN(160, "PCN_LOGIN", ""), PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), - PCN_LOGOUT(190, "PCN_LOGOUT", ""); + PCN_LOGOUT(190, "PCN_LOGOUT", ""), + UPDATE_LOCALE_RES(190, "LOCALE_RES_URL", ""); private int value; 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 653955c..3147319 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 @@ -214,6 +214,7 @@ public class MesPcnEnumUtil { } } + /** * MES_TYPE_CFG 类型信息 */ @@ -253,6 +254,7 @@ public class MesPcnEnumUtil { return tmp; } } + /** * MesProdBindRecord 是否是关键件 */ @@ -2097,6 +2099,9 @@ public class MesPcnEnumUtil { NEVER(-1, "不过期"), ONE_HOUR(3600, "一小时"), + FIVE_MINS(300, "5分钟"), + HALF_HOUR(1800, "半小时"), + ONE_QUARTER(900, "一刻钟"), ONE_MIN(60, "一分钟"); private int value; @@ -2433,7 +2438,6 @@ public class MesPcnEnumUtil { } - @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ONLINE_SEND_TYPE { From 3dd247491a2d3af823c71aa114fcc72054635fef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 16 Dec 2019 19:18:51 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=99=A8=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/softswitch/SuitClientModel.java | 2 ++ .../estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 2 +- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 3 ++- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 13 +++++++++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 7e64efb..a798d8b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -48,7 +48,9 @@ public class SuitClientModel { /** * 适配结果信息 */ + @XStreamCDATA private String suitMessage; + /** * 请求来源 */ diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index abee745..3b2e47c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamImplicit; import com.thoughtworks.xstream.annotations.XStreamOmitField; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -44,6 +43,7 @@ public class SuitServerModel { * 适配结果信息 */ // @XStreamImplicit + @XStreamCDATA private String suitMessage; /** diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index ef26b09..4b67424 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -81,9 +81,10 @@ public class CoreHqlPack { if(resource != null){ DdlPreparedPack.getNumEqualPack(resource.getResourceType(),"resourceType",result); + DdlPreparedPack.getNumEqualPack(resource.getSoftType(),"softType",result); DdlPreparedPack.getNumEqualPack(resource.getIsSystem(),"isSystem",result); DdlPreparedPack.getStringEqualPack(resource.getLanguageCode(),"languageCode",result); - DdlPreparedPack.getStringEqualPack(resource.getResourceKey(),"resourceKey",result); + DdlPreparedPack.getStringLikerPack(resource.getResourceKey(),"resourceKey",result); DdlPreparedPack.getStringLikerPack(resource.getResourceValue(),"resourceValue",result); } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index c451f54..7757888 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -98,6 +98,19 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配结果") private Integer suitResult; + @Column(name = "SUIT_START_DATE_TIME") + @ApiParam(value = "适配开始时间") + private String suitStartTime; + + @Column(name = "SUIT_END_DATE_TIME") + @ApiParam(value = "适配结束时间") + private String suitEndTime; + + @Column(name = "EXECUTE_TIME") + @ApiParam(value = "执行耗时") + @JsonSerialize(using = ToStringSerializer.class) + private Long executeTime; + @Lob @Column(name = "SUIT_MESSAGE") @ApiParam(value = "适配信息") From d4d30bf63445a874c5770e023acbc09288dda716 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 16 Dec 2019 23:27:14 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E3=80=90=20=E9=9B=B6=E4=BB=B6=E5=8F=B7?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0=EF=BC=8C=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E6=8F=90=E7=A4=BA=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E9=9B=B6=E4=BB=B6=EF=BC=8C=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=EF=BC=8C=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=EF=BC=88=E6=A0=87=E5=8C=85?= =?UTF-8?q?=E5=87=8F=E5=8E=BB=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=EF=BC=89?= =?UTF-8?q?=E3=80=82=E3=80=91=E3=80=90bug7020=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 13 +++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 85d93c7..878db14 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -119,6 +119,19 @@ public class WmsCSFactTrans extends BaseBean { @ApiParam(value = "物料数量", example = "1") public Double sumPartQty; + /** + * 条码状态:1=创建,10=已收货,20=已质检, + * 30=已入库,40=待出库,50=已出库, + * 60=在途,70=已隔离,80=破包,90=冻结,100=作废 + */ + @Transient + @ApiParam(value = "条码状态", example = "1") + public Integer snStatus; + + @Transient + @ApiParam(value = "条码状态(冻结时)", example = "1") + public Integer destSnStatus; + @Transient @ApiParam("存储区编号组") public String[] zoneNos; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index bcbb261..3b6b4bc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -93,6 +93,11 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer snStatus; + @Column(name = "DEST_SN_STATUS") + @ApiParam(value = "条码状态(冻结时)", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") + public Integer destSnStatus; + /** * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结 */ From d0ddf208c354f971791bd9d325857648d4a0f610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 17 Dec 2019 13:36:20 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E3=80=90KT-1297=20=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E7=9A=84=E3=80=90=E9=80=82=E7=94=A8=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E3=80=91=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java index af87b92..1ac54c6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRouting.java @@ -53,8 +53,6 @@ public class WmsRouting extends BaseBean { @Column(name = "FOR_PRODUCT") @ApiParam(value = "适用产品") - - private Integer forProduct; @Transient From 773f56b577cb9a091985b29ccd3ecb59c7431dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 17 Dec 2019 13:42:41 +0800 Subject: [PATCH 07/20] =?UTF-8?q?TASK=5FINO=5FSTATUS=2020=E5=92=8C30?= =?UTF-8?q?=E7=9A=84=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=90=8D=E4=B8=A5=E9=87=8D?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E5=AE=B9=E6=98=93=E8=AF=AF=E5=AF=BC?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index afd662b..a76b0fc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -925,8 +925,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TASK_INFO_STATUS { - CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"), - FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭"); + CREATE(10, 10, "创建"), HANDLEING(20, 20, "处理中"), + FINISH(30, 30, "已处理"), CLOSE(40, 40, "已关闭"); private int value; private int code; From 0c01ffb230e45e4c58b0f8060601e831bf0276e0 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 17 Dec 2019 14:57:50 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E3=80=90=E5=9C=A8=E9=85=8D=E6=96=99?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=B3=E4=B8=8A=E8=A7=92?= =?UTF-8?q?=E6=94=BE=E5=A4=A7=E9=95=9C=EF=BC=8C=E8=BE=93=E5=85=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E6=97=A0=E6=B3=95=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E4=B8=94=E6=98=BE=E7=A4=BA=E7=9A=84=E5=86=85=E5=AE=B9=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E6=9C=89=E6=9D=A5=E6=BA=90=EF=BC=8C=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=90=A6=E7=B4=A7=E6=80=A5=20=E3=80=916978?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 5703187..6711728 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -205,6 +205,10 @@ public class WmsDocMovementDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") private Integer printStatus; + @Transient + @ApiParam("优先级") + private String priority; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } From 14f1ced3019da64be5d73004136d769159cf405c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 17 Dec 2019 16:44:16 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9C=B0=E5=9D=80=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 4be5710..a7fd844 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -54,6 +54,9 @@ public class SessionUser implements Serializable { @ApiParam("列表默认分页数量") private Integer pageDefaultSize; + @ApiParam("文件展示地址") + private String fileViewUrl; + public SessionUser() { } From a38dc051accb3b964b3df1452569e6a55b2f45a3 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 17 Dec 2019 19:12:48 +0800 Subject: [PATCH 10/20] =?UTF-8?q?task=20`1308`=201=20PCN=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- .../{MesDefectRecordRepositoty.java => MesDefectRecordRepository.java} | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/{MesDefectRecordRepositoty.java => MesDefectRecordRepository.java} (84%) 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 9846537..ba4164f 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 @@ -3569,7 +3569,7 @@ public class MesEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(190, "LOCALE_RES_URL", ""); + UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"); private int value; 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 3147319..0c69efc 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 @@ -131,7 +131,8 @@ public class MesPcnEnumUtil { PCN_LOGIN(160, "PCN_LOGIN", ""), PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), - PCN_LOGOUT(190, "PCN_LOGOUT", ""); + PCN_LOGOUT(190, "PCN_LOGOUT", ""), + UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", ""); private int value; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepositoty.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepository.java similarity index 84% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepositoty.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepository.java index 12041c1..648fd46 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepositoty.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface MesDefectRecordRepositoty extends BaseRepository { +public interface MesDefectRecordRepository extends BaseRepository { } From d92850c1a48541aaf11e19c345f3493a7507290a Mon Sep 17 00:00:00 2001 From: gcj Date: Tue, 17 Dec 2019 19:50:03 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 36 ++++++++++++++++++++++ .../estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java | 6 ++++ 2 files changed, 42 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d6d917c..fbac38e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4709,4 +4709,40 @@ public class WmsEnumUtil { } } + /** + * 计划拉动明细表状态创建 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VENDOR_TYPE { + VENDOR(10, "供应商"), CARRIERS(20, "承运商"); + + private int value; + private String description; + + VENDOR_TYPE(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; + } + } + + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java index 7f62f02..388e6a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipModel.java @@ -23,4 +23,10 @@ public class WmsTmsShipModel { private Double recQty; @ApiParam("单位") private String unit; + + @ApiParam("序号") + private Integer item; + + @ApiParam("装车时间") + private String modifyDatetime; } From f800d3dd7b18a7250f5d16c3e38175a3babda066 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 17 Dec 2019 21:16:02 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E3=80=90=E6=88=90=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=BF=90=EF=BC=8C=E8=8E=B7=E5=8F=96=E5=9C=A8=E9=80=94=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsStockFifoModel.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java new file mode 100644 index 0000000..48e8954 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : 条码FIFO推荐 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2019-12-17 20:41 + * @Modify: + **/ +@Data +public class WmsStockFifoModel { + + @ApiParam(value = "工厂代码") + String organizeCode; + + @ApiParam(value = "物料集合") + List partNos; + + @ApiParam(value = "存储区集合") + List zoneNos; + + @ApiParam(value = "物料对应的存储区") + Map partToZoneMap; + + @ApiParam(value = "单据号") + String orderNo; + + @ApiParam(value = "物料对应的存储区集合") + Map> partToZonesMap; +} From 4f1455012f467b29ee13e22fa7c45257d4c4bf2a Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 17 Dec 2019 21:21:17 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E3=80=90=E9=A2=86=E6=96=99=E4=B8=8A?= =?UTF-8?q?=E7=BA=BF=E6=89=AB=E6=8F=8F=E6=97=B6=EF=BC=8C=E5=9C=A8=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=8C=E6=9D=A1=E7=A0=81=E5=90=8E=E5=B0=86=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=E5=B8=A6=E5=87=BA=E3=80=82=20?= =?UTF-8?q?=E3=80=91bug7024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 6711728..312209b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.Objects; /** * @Description :移库单明细实体(用于转储类业务) @@ -258,4 +259,17 @@ public class WmsDocMovementDetails extends BaseBean { @Column(name = "IS_SN") @ApiParam(value = "条码生成状态", example = "20") public Integer isSn; + + + public WmsDocMovementDetails () { + + } + + public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) { + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.destLocateNo = destLocateNo; + } + } From 15d3d3b5e168fe9f9850e83e2a72f8c2120ba36f Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 17 Dec 2019 22:29:54 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E3=80=90=20=09=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=98=E7=82=B9=EF=BC=88=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=89=E9=9C=80=E8=A6=81=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=BA=93=E4=BD=8D=E4=BB=A5=E5=90=8E=E7=AB=8B?= =?UTF-8?q?=E5=88=BB=E6=8F=90=E4=BA=A4=E3=80=82=E3=80=91=E3=80=90bug7040?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsCSOrderMasterModel.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java new file mode 100644 index 0000000..dc572b6 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 盘点批量操作 + * @author qianhs + */ +@Data +public class WmsCSOrderMasterModel implements Serializable { + + private static final long serialVersionUID = -5490167040159056107L; + + @ApiParam("盘点订单主表") + public List wmsCSOrderMasterList; + + @ApiParam("工厂代码") + public String organizeCode; +} From b5006a88f1a9c24991645109df860277b30a4117 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Wed, 18 Dec 2019 09:42:48 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E3=80=90#1302=20=E5=99=A8=E5=85=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=96=B0=E5=A2=9E=E5=99=A8=E5=85=B7?= =?UTF-8?q?=E8=A7=84=E5=88=99=E6=A3=80=E6=9F=A5=E7=BB=84=E4=BB=B6=E3=80=91?= =?UTF-8?q?=E3=80=90#1303=20=E5=99=A8=E5=85=B7=E7=AE=A1=E7=90=86-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=9B=B4=E6=96=B0=E7=AE=B1=E6=9D=A1=E7=A0=81=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index a76b0fc..114c08f 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -990,6 +990,7 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), + SCRAP(70,"报废"), COMMING(80, "在途"); private int value; From ba355aab55ecd7f039ee8d058785b10c299aca64 Mon Sep 17 00:00:00 2001 From: gcj Date: Wed, 18 Dec 2019 09:47:48 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java index b04a9ad..c0cbe93 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExt.java @@ -109,6 +109,10 @@ public class WmsTmsShippingExt extends BaseBean { @ApiParam("关联单号") private String refOrderNo; + @Column(name="PATH_URL") + @ApiParam("回执单地址") + private String pathUrl; + @Transient @ApiParam("打印模板列表") private List shipModels; From b29d84bbadabecc73e3901ec332a328d11904bae Mon Sep 17 00:00:00 2001 From: gcj Date: Wed, 18 Dec 2019 09:58:15 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=BE=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index b20a52b..5357a32 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -58,4 +58,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam(value ="车牌号RDD") private String carNo; + + @ApiParam("回执单地址") + private String pathUrl; } From 0103c64247f65165c4226603d96f6a9d4ce642d8 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 18 Dec 2019 11:10:52 +0800 Subject: [PATCH 18/20] =?UTF-8?q?task=20`1316`=201=20=E6=8B=86=E5=88=86job?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0c69efc..988baf8 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 @@ -132,7 +132,7 @@ public class MesPcnEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", ""); + UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"); private int value; From 81b84d86e5e32f6fbc955f8bb4f5865802ca9c47 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 18 Dec 2019 12:20:39 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E6=96=B0=E5=A2=9EKPI=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttLineModel.java | 5 ++-- .../cn/estsh/i3plus/pojo/aps/model/KPIModel.java | 25 +++++++++++++++++ .../i3plus/pojo/aps/model/ResourceLodaRequest.java | 23 ++++++++++++++++ .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 31 ++++++++++++++++++++++ 4 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java index f085c30..0c5ab45 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java @@ -4,8 +4,7 @@ import lombok.Data; @Data public class GanttLineModel { - private long id; - private long source; - private long target; + private long from; + private long to; private int type; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java new file mode 100644 index 0000000..b5007f0 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +/** + * KPI接口数据 + */ +@Data +public class KPIModel { + private Integer salesOrderCount; + + private Integer productOrderCount; + + private Integer schedWorkCount; + + private Integer noSchedWorkCount; + + private Integer confirmOrderCount; + + private String produceTimes; + + private String settingTimes; + + private Integer overdueSalesCount; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java new file mode 100644 index 0000000..c35f89e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLodaRequest.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import lombok.Data; + +import java.util.Date; + +@Data +public class ResourceLodaRequest { + private ApsEnumUtil.RESOURCE_LOAD_SPAN span; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date begin; // 统计开始时间 + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date end; // 统计结束时间 + + private Long[] resourceIds; +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 0d23467..fb63168 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -1079,4 +1079,35 @@ public class ApsEnumUtil { return description; } } + + /** + * 资源符合时间间隔类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum RESOURCE_LOAD_SPAN { + ONE_HOUR("ONE_HOUR", "1小时"), + TWO_HOUR("TWO_HOUR", "2小时"), + SIX_HOUR("SIX_HOUR", "6小时"), + EIGHT_HOUR("EIGHT_HOUR", "8小时"), + TWELVE_HOUR("TWELVE_HOUR", "12小时"), + ONE_DAY("ONE_DAY", "1天"), + ONE_WEEK("ONE_WEEK", "1周"), + ONE_MONTH("ONE_MONTH", "1月"); + + private String value; + private String description; + + RESOURCE_LOAD_SPAN(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } From b06ecdd3f375cb22d85ada0c904bca2a34356774 Mon Sep 17 00:00:00 2001 From: zcg Date: Wed, 18 Dec 2019 14:27:16 +0800 Subject: [PATCH 20/20] =?UTF-8?q?[bug=EF=BC=9A7043=EF=BC=8CPCN=E8=8A=82?= =?UTF-8?q?=E7=82=B9-=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java | 8 ++++++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java | 3 +++ 3 files changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java index 818cbcb..247c8d9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java @@ -39,10 +39,18 @@ public class MesPcn extends BaseBean { @ApiParam("区域") private String areaCode; + @Column(name = "AREA_NAME") + @ApiParam("区域名称") + private String areaName; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index 33f1de2..c98a0dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -39,10 +39,18 @@ public class MesPcn extends BaseBean { @ApiParam("区域") private String areaCode; + @Column(name = "AREA_NAME") + @ApiParam("区域") + private String areaName; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心") + private String workCenterName; + @Column(name = "PCN_VERSION") @ApiParam("PCN版本") private String pcnVersion; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java index 0e1a398..b8ede8d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartObjectModel.java @@ -50,6 +50,9 @@ public class MesPartObjectModel { @ApiParam("对象名称") private String objectName; + public MesPartObjectModel() { + } + public MesPartObjectModel(Long id, String organizeCode, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer isValid, Integer isDeleted, String partNo, String objectCode, String workCenterCode, String objectName) { this.id = id; this.organizeCode = organizeCode;