From f800d3dd7b18a7250f5d16c3e38175a3babda066 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 17 Dec 2019 21:16:02 +0800 Subject: [PATCH 1/4] =?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 2/4] =?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 3/4] =?UTF-8?q?=E3=80=90=20=09=E5=BA=93=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=9B=98=E7=82=B9=EF=BC=88=E4=B8=A4=E4=B8=AA=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=89=E9=9C=80=E8=A6=81=E5=8F=AF=E4=BB=A5=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=BA=93=E4=BD=8D=E4=BB=A5=E5=90=8E=E7=AB=8B=E5=88=BB?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E3=80=82=E3=80=91=E3=80=90bug7040=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 4/4] =?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;