From 1e5fe4270258ec8dcf75a52aa04b748571f7c2b0 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Thu, 3 Sep 2020 01:54:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E9=BA=A6?= =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E8=B4=A8=E6=A3=80=E5=BD=95=E5=85=A5=E4=B8=8D?= =?UTF-8?q?=E8=89=AF=E6=95=B0=E9=87=8F=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsQCSNErrorList.java | 51 ++++++++++++++-------- .../wms/repository/WmsQCSNErrorListRepository.java | 16 +++++++ 2 files changed, 49 insertions(+), 18 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java index 9f2e2b3..4d54afc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCSNErrorList.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -26,66 +27,80 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_QC_SN_ERROR_LIST") +@Table(name="WMS_QC_SN_ERROR_LIST", + indexes = { + @Index(columnList = "ORGANIZE_CODE"), + @Index(columnList = "ORDER_NO"), + @Index(columnList = "PART_NO"), + @Index(columnList = "SN") +}) @Api("质检单条码质检不良清单表") public class WmsQCSNErrorList extends BaseBean { + private static final long serialVersionUID = 4905945381732744790L; - private static final long serialVersionUID = 7779401323803118985L; @Column(name="ORDER_NO") @ApiParam("单号") - public String orderNo; + private String orderNo; @Column(name="ITEM") @ApiParam("行号") - public String item; + private String item; /** - * 状态:1=创建,10=已处理 + * 状态:10=创建,20=已处理 */ @Column(name="ITEM_STATUS") @ApiParam(value = "状态", example = "1") - public Integer itemStatus; + private Integer itemStatus; @Column(name="REMARK") @ApiParam("备注") - public String remark; + private String remark; - @Column(name="PASS_QTY", nullable = false) - @ApiParam("合格数量") + @Column(name="SAMPLE_QTY", nullable = false) + @ApiParam("检验数量") @ColumnDefault("0") - public double passQty; + private double sampleQty; @Column(name="REJECT_QTY", nullable = false) @ApiParam("不合格数量") @ColumnDefault("0") - public double rejectQty; + private double rejectQty; @Column(name="UNIT") @ApiParam("单位") - public String unit; + private String unit; @Column(name="PART_NO") @ApiParam("物料编码") - public String partNo; + private String partNo; @Column(name="PART_NAME_RDD") @ApiParam("物料名称") - public String partNameRdd; + private String partNameRdd; @Column(name="SN") @ApiParam("条码") - public String sn; + private String sn; @Column(name = "QC_USER") @ApiParam("检验员") - public String qcUser; + private String qcUser; @Column(name = "QC_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00") - public String qcTime; + private String qcTime; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编码") - public String vendorNo; + private String vendorNo; + + @Column(name = "ERROR_CODE") + @ApiParam("不良代码") + private String errorCode; + + @Column(name = "ERROR_DESC_RDD") + @ApiParam("不良描述") + private String errorDescRdd; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java new file mode 100644 index 0000000..8fe97a0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsQCSNErrorListRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsQCSNErrorList; +import org.springframework.stereotype.Repository; + +/** + * @Description : 质检单条码不良操作类 + * @Reference : + * @Author : rock.yu + * @CreateDate : 2020-09-02 21:06 + * @Modify: + **/ +@Repository +public interface WmsQCSNErrorListRepository extends BaseRepository { +} From df4e794a4862f00957780a058baedf5ed1fd5774 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 3 Sep 2020 02:10:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8DMGN=E7=B3=BB=E5=88=97BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 49 ++++++++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 11 +++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 61 insertions(+), 1 deletion(-) 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 6b4590a..c085744 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 @@ -4762,6 +4762,55 @@ public class WmsEnumUtil { } } + + /** + * 客户发运 发运数量控制逻辑 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCK_FIFO_SN_TYPE { + SHIP_FLAG(10, "客户发运"), + OVER_SEND(20, "多发"), + CONSISTENT(30, "一致"), + NO_CONTROL(40, "不控制"), + OVER_ONE_BOX(50, "多一箱"); + + + private int value; + private String description; + + LOCK_FIFO_SN_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static LOCK_FIFO_SN_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * 拉动方式维护 * 默认为 10 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 797b3cd..4a0c864 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 @@ -508,4 +508,15 @@ public class WmsDocMovementDetails extends BaseBean { this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); this.color = color; } + + public WmsDocMovementDetails(String orderNo, Double qty, Double pickQty, String modifyDateTime, String createDateTime, String planDate, String planTime, Integer orderStatus) { + this.orderNo = orderNo; + this.qty = qty; + this.pickQty = pickQty; + this.modifyDatetime = modifyDateTime; + this.createDatetime = createDateTime; + this.planDate = planDate; + this.planTime = planTime; + this.orderStatus = orderStatus; + } } 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 a6394e8..73d5512 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 @@ -265,7 +265,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); - DdlPreparedPack.getStringEqualPack(wmsPOMaster.getShipmentNoteNumber(), "shipmentNoteNumber", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getErpSrcNo(), "erpSrcNo", result); DdlPreparedPack.getStringRightLikerPack(wmsPOMaster.getContainerNo(), "containerNo", result); if (wmsPOMaster.getPriorRC() != null && wmsPOMaster.getPriorRC() == WmsEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) { ArrayList numList = new ArrayList<>(); From a53e7c572479ee4c789b009d920dfafe73c2fa22 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 3 Sep 2020 11:06:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=902712=20=E5=AD=90=2009=201.2.1.1.1?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=8F=91=E8=BF=90=E8=BD=A6=E8=BE=86=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=20/=2009=201.2.1.1.1=E5=AE=A2=E6=88=B7=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E8=BD=A6=E8=BE=86=E6=8E=A8=E8=8D=90=20-=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsRecommendCarModel.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java index f82779d..35bdbc5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java @@ -21,15 +21,27 @@ public class WmsRecommendCarModel extends BaseBean implements Serializable { @ApiParam(value = "计划日期") String planTimeStart; @ApiParam(value = "待发物料总数") - String partNo; + Double partNoSum; @ApiParam(value = "标准包装") - String snp; + Double snp; @ApiParam(value = "单包装体积(m3)") Double vol; @ApiParam(value = "物料体积(m3)") Double partTotalVol; + @ApiParam(value = "物料号") + String partNo; + + public WmsRecommendCarModel(String partNo, Double partNoSum, Double vol, Double snp,Double partTotalVol,String organizeCode,Long id) { + this.partNo = partNo; + this.partNoSum = partNoSum; + this.vol = vol; + this.snp = snp; + this.partTotalVol = partTotalVol; + this.organizeCode = organizeCode; + this.id = id; + } -// @ApiParam(value = "车辆编号") + // @ApiParam(value = "车辆编号") // String carNo; // @ApiParam(value = "车辆名称") // String carDesc; From 92e8364b5892cf879a842a1c60df63e06b40ba6c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 3 Sep 2020 16:24:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=901140=2009=201.2.1.1.1=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=8F=91=E8=BF=90=E8=BD=A6=E8=BE=86=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=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/WmsCar.java | 17 ++++++++++++++++- .../i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java | 4 +++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java index 0e99f0f..ebdce7a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCar.java @@ -91,7 +91,22 @@ public class WmsCar extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double volume; - @ApiParam(value = "需要(辆)") @Transient + @ApiParam(value = "需要(辆)") private Integer carQty; + + @Transient + @ApiParam(value = "车辆序号") + private Integer seq; + + public WmsCar() { + } + + public WmsCar(WmsCar car, Integer seq, String carDesc) { + this.id = car.id; + this.organizeCode = car.organizeCode; + this.volume = car.volume; + this.carNo = seq.toString(); + this.carDesc = carDesc; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java index 35bdbc5..ec0fc07 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsRecommendCarModel.java @@ -31,7 +31,8 @@ public class WmsRecommendCarModel extends BaseBean implements Serializable { @ApiParam(value = "物料号") String partNo; - public WmsRecommendCarModel(String partNo, Double partNoSum, Double vol, Double snp,Double partTotalVol,String organizeCode,Long id) { + public WmsRecommendCarModel(String partNo, Double partNoSum, Double vol, Double snp,Double partTotalVol, + String organizeCode,Long id,String planTimeStart) { this.partNo = partNo; this.partNoSum = partNoSum; this.vol = vol; @@ -39,6 +40,7 @@ public class WmsRecommendCarModel extends BaseBean implements Serializable { this.partTotalVol = partTotalVol; this.organizeCode = organizeCode; this.id = id; + this.planTimeStart = planTimeStart; } // @ApiParam(value = "车辆编号")