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 853cc70..0eb01d8 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 @@ -193,10 +193,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ORDER_DETAILS_STATUS { - CREATE(10, "N", "创建"), - RECEIPTED(20, "R", "已完成"), - CANCEL(30, "C", "行取消"), - PRINTED(40, "C", "已打印"); + CREATE(10, "CREATE", "创建"), + RECEIPTED(20, "FINISHED", "已完成"), + CANCEL(30, "CANCLE", "行取消"), + PRINTED(40, "PRINTED", "已打印"); private int value; private String code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java index 0bdd192..7d7156b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -23,7 +23,7 @@ public class SapBase { private String actusr = "导入"; @ApiParam(value = "SID", example = "-1") - private String sid = ( Math.abs(new Random().nextInt())+ ""); + private String sid = ""; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiParam(value = "接收数据日期", example = "-1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java index 62d117f..6864439 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapCyco.java @@ -52,7 +52,7 @@ public class SapCyco extends SapBase{ @AnnoOutputColumn private String zxm; - @ApiParam(value = "库存帐冻结标识") + @ApiParam(value = "库存账冻结标志") @AnnoOutputColumn private String zdjbs; 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 7ee9802..920e62f 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 @@ -30,7 +30,7 @@ public class WmsActionResponseBean implements Serializable { public Map barCode; @ApiParam("进度") - public String percent ="消息提示："; + public String percent = "消息提示："; @ApiParam("当前步骤") public Integer currentStep; @@ -110,6 +110,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; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java index e383d9e..57d4028 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java @@ -60,4 +60,17 @@ public class WmsCSAdjustRange extends BaseBean { @Transient @ApiParam("单位") public String unit; + + public WmsCSAdjustRange(){} + public WmsCSAdjustRange(String orderNo, Integer item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) { + this.orderNo = orderNo; + this.item = item; + this.isAdjust = isAdjust; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.zoneNo = zoneNo; + this.locateNo = locateNo; + this.unit = unit; + this.organizeCode = organizeCode; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java index 738622a..92b472e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLineLocatePart.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api(value="线边库物料信息",description = "线边库物料信息") +@Deprecated public class WmsLineLocatePart extends BaseBean { @Column(name="LOCATE_NO") 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; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index b869f80..767edb5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -202,8 +202,17 @@ public class WmsStockSn extends BaseBean { @ApiParam(value = "工厂名称") public String organizeName; + @Transient + @ApiParam(value = "物料数量总和") + public Double sumPartQty; + + @Transient + @ApiParam(value = "条码数量总和") + public Long snCount; + public WmsStockSn(){} + public WmsStockSn(String partNo){ this.partNo = partNo; } @@ -213,4 +222,10 @@ public class WmsStockSn extends BaseBean { } public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();} + + public WmsStockSn( Long snCount, Double sumPartQty,String locateNo) { + this.snCount = snCount; + this.sumPartQty = sumPartQty; + this.locateNo = locateNo; + } } 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/repository/WmsBomRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomRepository.java new file mode 100644 index 0000000..4ea9b21 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsBomRepository.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsBom; +import org.springframework.stereotype.Repository; + +/** + * Created by Administrator on 2019/6/22. + */ +@Repository +public interface WmsBomRepository extends BaseRepository { +} 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..2bb7afa 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 and snStatus=40 " + "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); } 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..79059a6 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 @@ -77,8 +77,14 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result); + DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result); + + DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(), + wmsDocMovementDetails.getCreateDateTimeEnd(),"createDatetime",result,true); getStringBuilderPack(wmsDocMovementDetails, result); return result; @@ -1739,7 +1745,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue(), WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result); - DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsCSOrderMaster, result); @@ -1998,5 +2004,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; + } }