From 8e5c2f4b00c8e43fd506dfec69875823b6f8a648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 18 Nov 2020 18:31:56 +0800 Subject: [PATCH 1/8] BUG#12170,12417,12166,12437,12452 --- .../estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java index b327dc3..d2bd144 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java @@ -35,6 +35,9 @@ public class WmsVendorDelayMasterModel extends BaseBean { @ApiParam(value = "延迟次数") private Long sumDelayCount; + @ApiParam(value = "延迟到货百分比") + private Double delayPercent; + @ApiParam(value = "查询开始时间") private String startDateTime; @@ -62,7 +65,8 @@ public class WmsVendorDelayMasterModel extends BaseBean { this.createDatetime = createDateTime; } - public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, String actualPlanTime, String vendorNo, String vendorName, String organizeCode) { + public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, + String actualPlanTime, String vendorNo, String vendorName, String organizeCode) { this.orderNo = orderNo; this.reason = reason; this.planDate = planDate; From 2de0d76af3e7b6ae26514d19733d558b7e6f79d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 18 Nov 2020 21:55:38 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E3=80=902958=2011=202.5.3=20=E7=83=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8A=E4=BB=B6=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesFurnaceLocation.java | 53 ++++++++++++++++++++++ .../pojo/mes/bean/MesFurnaceLocationDetail.java | 52 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 ++ .../i3plus/pojo/mes/bean/MesPackageTravel.java | 18 ++++++++ .../estsh/i3plus/pojo/mes/bean/MesPartFurnace.java | 40 ++++++++++++++++ .../MesFurnaceLocationDetailRepository.java | 14 ++++++ .../repository/MesFurnaceLocationRepository.java | 14 ++++++ .../mes/repository/MesPartFurnaceRepository.java | 14 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 8 ++++ 9 files changed, 217 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java new file mode 100644 index 0000000..c42ce77 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocation.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FURNACE_LOCATION") +@Api("MES_炉内模式位置信息") +public class MesFurnaceLocation extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818263404126L; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + + @Column(name = "MODEL_IMG_URL") + @ApiParam("模式图片路径") + private String modelImgUrl; + + @Column(name = "SEQ") + @ApiParam("推荐顺序") + private Integer seq; + + @Transient + @ApiParam("容器编号") + private String ctNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java new file mode 100644 index 0000000..15e8fb0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFurnaceLocationDetail.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_FURNACE_LOCATION_DETAIL") +@Api("MES_炉内占位信息") +public class MesFurnaceLocationDetail extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818212133126L; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; +} 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 770fcc1..fc5e470 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 @@ -153,6 +153,10 @@ public class MesPackage extends BaseBean implements Serializable { @ApiParam("erp工作中心") private String erpWorkCenterCode; + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + @Transient @ApiParam("目标库位代码") private String destLocationCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 1b9e494..8222fb8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -54,5 +54,23 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码4") private String packageNo4; + @Column(name = "CT_NO") + @ApiParam("容器编号") + private String ctNo; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name = "FN_LOCATION_NO") + @ApiParam("炉内位置代码") + private String fnLocationNo; + + @Column(name = "CT_LOCATION_NO") + @ApiParam("容器位置编号") + private String ctLocationNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java new file mode 100644 index 0000000..8ba6f09 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartFurnace.java @@ -0,0 +1,40 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/4/20 5:16 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_FURNACE") +@Api("MES_物料上炉模式") +public class MesPartFurnace extends BaseBean implements Serializable { + + private static final long serialVersionUID = 3681747818263404111L; + + @Column(name = "MODEL_NO") + @ApiParam("模式编号") + private String modelNo; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + private String partNo; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java new file mode 100644 index 0000000..777a721 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationDetailRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocationDetail; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesFurnaceLocationDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java new file mode 100644 index 0000000..e2b36dd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFurnaceLocationRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesFurnaceLocation; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesFurnaceLocationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java new file mode 100644 index 0000000..c81d1dd --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFurnaceRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartFurnace; + +/** + * @Description: + * @Reference: + * @Author: joke.wang + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesPartFurnaceRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 10d429d..91f381f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3560,4 +3560,12 @@ public class MesHqlPack { } return packBean; } + + public static DdlPackBean getMesFurnaceLocation(MesFurnaceLocation mesFurnaceLocation) { + DdlPackBean packBean = getAllBaseData(mesFurnaceLocation.getOrganizeCode()); + DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getFnLocationNo(), "fnLocationNo", packBean); + DdlPreparedPack.getStringLikerPack(mesFurnaceLocation.getModelNo(), "modelNo", packBean); + DdlPreparedPack.getNumEqualPack(mesFurnaceLocation.getIsValid(), "isValid", packBean); + return packBean; + } } From 88376bb350eb77e3c0a849582e8c61923f9a9c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 18 Nov 2020 22:01:01 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E3=80=902958=2011=202.5.3=20=E7=83=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8A=E4=BB=B6=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/MesPcnEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 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 95a12d9..bb8bf78 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 @@ -2559,7 +2559,8 @@ public class MesPcnEnumUtil { public enum PACKAGE_OP_TYPE { PACK(10, "打包"), - UNPACK(20, "拆包"); + UNPACK(20, "拆包"), + STOP_OVER(30, "过站"); private int value; private String description; From 92b395ad3fbb4abd13a34938fd1932731c73cafc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 18 Nov 2020 22:07:17 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=902958=2011=202.5.3=20=E7=83=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8A=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/mes/bean/MesPackageTravel.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index d85bae8..83ae8a0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -73,8 +73,4 @@ public class MesPackageTravel extends BaseBean implements Serializable { @Column(name = "FN_LOCATION_NO") @ApiParam("炉内位置代码") private String fnLocationNo; - - @Column(name = "CT_LOCATION_NO") - @ApiParam("容器位置编号") - private String ctLocationNo; } From 359e085aac2fbe5ead234afb6d6db3679818748c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 19 Nov 2020 09:29:03 +0800 Subject: [PATCH 5/8] BUG#12430 --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 89f6ed4..e34f49c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -324,10 +324,10 @@ public class WmsPOMasterDetails extends BaseBean { this.qty = qty; } - public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty, + public WmsPOMasterDetails(String orderNo, String remark, Integer item,String partNo,String partNameRdd, Double qty, Double rcQty, Integer itemStatus) { this.orderNo = orderNo; - this.erpSrcNo = erpSrcNo; + this.remark = remark; this.item = item; this.partNo = partNo; this.partNameRdd = partNameRdd; From a0776b74012edf1b3ef455e684f2f11f7d9909be Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Thu, 19 Nov 2020 10:23:34 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=A1=E6=96=AF?= =?UTF-8?q?=E9=A9=AC=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6,=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/PackageDetailModel.java | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java new file mode 100644 index 0000000..72c28e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +/** + * @author dominic + * @date 2020/11/18 21:52 + * @desc 包装明细 + */ +@Data +@Api("包装明细") +public class PackageDetailModel { + + @ApiParam("料架号") + private String ctNo; + + @ApiParam("容器位置编号") + private String ctLocationNo; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("物料编号") + private String partNo; + + public PackageDetailModel(String ctNo, String ctLocationNo, String serialNumber, String partNo) { + this.ctNo = ctNo; + this.ctLocationNo = ctLocationNo; + this.serialNumber = serialNumber; + this.partNo = partNo; + } + + public PackageDetailModel() { + } + + ; +} From 0f5ab7b14458025751fca9aa485d1b6ce320fec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 19 Nov 2020 14:06:09 +0800 Subject: [PATCH 7/8] BUG#12609 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index 344757d..85012a9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -75,4 +75,8 @@ public class BasCustomer extends BaseBean { @ApiParam(value = "安全库存") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2) private Double safetyStock; + + public double getSafetyStockVal() { + return this.safetyStock == null ? 0.0d : this.safetyStock; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 3c9b438..ffde294 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -110,7 +110,8 @@ public class WmsQCDetails extends BaseBean { Double qty, String unit, String orderNo, Integer itemStatus, String remark, Double factQty, Double passQty, Double rejectQty, - Integer orderStatus, String vendorNo, String vendorDesc) { + Integer orderStatus, String vendorNo, String vendorDesc, + String createUser, String createDatetime,String modifyUser,String modifyDatetime) { this.organizeCode = organizeCode; this.partNo = partNo; this.partNameRdd = partNameRdd; @@ -126,6 +127,10 @@ public class WmsQCDetails extends BaseBean { this.orderStatus = orderStatus; this.vendorNo = vendorNo; this.vendorDesc = vendorDesc; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; } public WmsQCDetails(String partNo, String partNameRdd, String item, From d3bcf1499e3e0685f79a974e511ad7d5b56ba8da Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 19 Nov 2020 14:10:21 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 83ae8a0..42cc4d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -34,7 +34,7 @@ public class MesPackageTravel extends BaseBean implements Serializable { @ApiParam("包装编码") private String packageNo; - @Column(name = "CT_LOCATION_NO", nullable = false) + @Column(name = "CT_LOCATION_NO") @ApiParam("容器位置编号") private String ctLocationNo;