From 326992e6ceebbdd9839765d3c86a0fca4002d5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Sat, 22 Jun 2019 17:05:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=9C=B0=E6=9F=A5=E8=AF=A2=E5=AD=98=E5=82=A8=E5=8C=BA=E7=9A=84?= =?UTF-8?q?sql=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java | 7 +++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index 16b0109..68e40c5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.math.BigDecimal; /** * @Description : 作业任务明细信息 @@ -137,6 +138,10 @@ public class WmsTaskDetails extends BaseBean { return this.qty == null ? 0 : this.qty; } + public String getQtyTxt(){ + return new BigDecimal(getQty() + "").stripTrailingZeros().toPlainString(); + } + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java index 6481548..06e69ff 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java @@ -89,4 +89,11 @@ public class WmsZones extends BaseBean { @Transient @ApiParam(value ="子存储区列表") private List childList; + + public WmsZones(String zoneNo){ + this.zoneNo = zoneNo; + } + + public WmsZones(){} + } 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 d876980..ead2da2 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 @@ -1998,5 +1998,23 @@ public class WmsHqlPack { return result; } + /** + * 根据存储区编号集合、库位类型查询库位信息 + * + * @param zoneNoList + *@param wmsZones + * @param locateType + * @return + */ + public static DdlPackBean packLocateNoByZoneNo(List zoneNoList , WmsZones wmsZones , Integer locateType) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getInPackList(zoneNoList, "zoneNo", result); + DdlPreparedPack.getNumEqualPack(locateType, "locateType", result); + getStringBuilderPack(wmsZones, result); + + return result; + } } From 659968da3c3722b3f82d063a2af70e64662bcd06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Sat, 22 Jun 2019 17:31:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=8A=A0=E8=BD=BD=E6=B5=81=E7=A8=8B=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E4=B8=8D=E6=8A=A5=E9=94=99+MOVE=5FNO?= =?UTF-8?q?=E5=AD=98KEY=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java index 8ddd632..5e904b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java @@ -29,7 +29,7 @@ public class WmsActionResponseBean implements Serializable { public Map barCode; @ApiParam("进度") - public String percent ="消息提示："; + public String percent = "消息提示："; @ApiParam("当前步骤") public Integer currentStep; @@ -97,6 +97,9 @@ public class WmsActionResponseBean implements Serializable { @ApiParam(value = "是否完成流程操作") public Boolean isComplete = false; + @ApiParam(value = "交易类型信息") + public WmsTransType wmsTransType; + public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; From c6f5111510229dcd42d6ecd08eb13aa729ae800e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 22 Jun 2019 17:58:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?1.=20=E8=A7=A3=E5=86=B3=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E4=B8=AD=E7=9A=84=20FIFO=20=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E5=AD=98=E5=82=A8=E5=8C=BA=E6=8E=A8=E8=8D=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/repository/WmsStockSnRepository.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java index a00ba2d..80ccc6e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import org.springframework.data.jpa.repository.Query; +import java.util.List; + /** * @Description : 库存条码dao层 * @Reference : @@ -21,13 +23,14 @@ public interface WmsStockSnRepository extends BaseRepository { /** + * Rock.Yu at 2019-06-22 11:05 * 按照存储区代码查询最早批次的物料条码 * 按照 特殊批次、生产日期、收货日期 优先级从高到低依次排序 * @return 最早批次的条码 */ - @Query(value = "select sn from WmsStockSn " + - "where organizeCode=?1 and isValid=?2 and isDeleted=?3 " + - "and zoneNo=?4 and partNo=?5 " + + @Query(value = "from WmsStockSn " + + "where organizeCode=?1 " + + "and zoneNo=?2 and partNo=?3 and isValid=?4 and isDeleted=?5 " + "order by fixLotNo, dateCode, lotNo") - WmsStockSn findFirstFifoSNByZoneNo(String organizeCode, int isValid, int isDeleted, String zoneNo, String partNo); + List findByFifoSNByZoneNo(String organizeCode, String zoneNo, String partNo, int isValid, int isDeleted); } From 6ee8d7d2a2ce3e3c5a583935aa32ecf79b1bd93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Sat, 22 Jun 2019 22:04:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E6=BD=9C=E5=9C=A8BU?= =?UTF-8?q?G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 69 ++++++++++++---------- 1 file changed, 37 insertions(+), 32 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 bb875c1..e6e934f 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 @@ -30,125 +30,130 @@ import javax.persistence.*; }) @Api("PO订单明细信息") public class WmsPOMasterDetails extends BaseBean { + + private static final long serialVersionUID = -677572691809622129L; + @Column(name = "PART_NO") @ApiParam("物料编码") - public String partNo; + private String partNo; - @Column(name = "BOX_QTY" ) + @Column(name = "BOX_QTY") @ColumnDefault("0") - @ApiParam(value ="箱数", example = "0") - public Integer boxQty; + @ApiParam(value = "箱数", example = "0") + private Integer boxQty; @Column(name = "PART_NAME_RDD") @ApiParam("物料名称") - public String partNameRdd; + private String partNameRdd; @Column(name = "ITEM") @ApiParam("行号") - public Integer item; + private Integer item; @Column(name = "QTY") @ColumnDefault("0") @ApiParam(value = "需求数量", example = "0") - public Double qty; + private Double qty; - public Double getQty(){ return this.qty == null ? 0 : this.qty; } + // 不可能为 null 值 + // Rock.Yu at 2019-06-22 20:03 + //private Double getQty(){ return this.qty == null ? new Double(0) : this.qty; } @Column(name = "UNIT") @ApiParam("单位") - public String unit; + private String unit; @Column(name = "ORDER_NO") @ApiParam("订单号") - public String orderNo; + private String orderNo; @Column(name = "PRINT_QTY") @ColumnDefault("0") @ApiParam(value = "条码打印数量", example = "0") - public Double printQty; + private Double printQty; - public Double getPrintQty(){ return this.printQty == null ? 0 : this.printQty; } + //private Double getPrintQty(){ return this.printQty == null ? new Double(0) : this.printQty; } @Column(name = "RC_QTY") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") - public Double rcQty; + private Double rcQty; - public Double getRcQty(){ return this.rcQty == null ? 0 : this.rcQty; } + //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; } @Column(name = "PASS_QTY") @ColumnDefault("0") @ApiParam(value = "质检合格数量", example = "0") - public Double passQty; + private Double passQty; - public Double getPassQty(){ return this.passQty == null ? 0 : this.passQty; } + //private Double getPassQty(){ return this.passQty == null ? new Double(0) : this.passQty; } @Column(name = "NG_QTY") @ColumnDefault("0") @ApiParam(value = "质检不合格数量", example = "0") - public Double ngQty; + private Double ngQty; - public Double getNgQty(){ return this.ngQty == null ? 0 : this.ngQty; } + //private Double getNgQty(){ return this.ngQty == null ? new Double(0) : this.ngQty; } @Column(name = "PLAN_DATE") @ApiParam("计划交货日期") - public String planDate; + private String planDate; @Column(name = "PLAN_TIME") @ApiParam("计划交货时间") - public String planTime; + private String planTime; @Column(name = "ERP_AREA_NO") @ApiParam("默认收货库存地") - public String erpAreaNo; + private String erpAreaNo; /** * 状态:10 N=正常,20 C=行取消 */ @Column(name = "ITEM_STATUS") @ApiParam("状态") - public Integer itemStatus; + private Integer itemStatus; @Column(name = "SNP") @ApiParam("标准包装") - public Double snp; + private Double snp; /** * 是否免费:0=计费,1=免费 */ @Column(name = "IS_FREE") @ApiParam(value = "是否免费", example = "1") - public Integer isFree; + private Integer isFree; @Transient @ApiParam(value = "散件收货输入数量", example = "0") - public Double inputRcQty; + private Double inputRcQty; @Transient @ApiParam(value = "供应商批次") - public String dateCode; + private String dateCode; @Transient @ApiParam("前端表格编辑使用") - public Boolean isSet = false; + private Boolean isSet = false; @Transient @ApiParam("供应商批次字段是否可编辑") - public Boolean isDateCodeEdit = true; + private Boolean isDateCodeEdit = true; - public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; } + //private Double getInputRcQty(){ return this.inputRcQty == null ? new Double(0) : this.inputRcQty; } @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient int lockVersion; + private transient int lockVersion; @Transient @ApiParam("PO条码总箱数") - public Integer totalBoxes; + private Integer totalBoxes; @Transient @ApiParam("差异") - public Double difference; + private Double difference; }