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 1/2] =?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 2/2] =?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);