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 72f81e1..5b371b0 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 @@ -9834,6 +9834,257 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 单据在 move To erp 中的状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MOVE_TO_ERP_STATUS { + NOT_CRETED(10, "NOT_CRETED", "未创建"), + CREATED(20, "CREATED", "已创建"), + SYNCED(30, "IS_SYNC", "已回传"), + ; + + private int value; + private String code; + private String description; + + MOVE_TO_ERP_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static WmsEnumUtil.MOVE_TO_ERP_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 单据在 oq 中的状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OQ_STATUS { + NORMAL(10, "NORMAL", "正常"), + ABNORMAL(20, "ABNORMAL", "异常"), + ; + + private int value; + private String code; + private String description; + + OQ_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static WmsEnumUtil.OQ_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 单据在 iq 中的状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IQ_STATUS { + NORMAL(10, "NORMAL", "正常"), + ABNORMAL(20, "ABNORMAL", "异常"), + ; + + private int value; + private String code; + private String description; + + IQ_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static WmsEnumUtil.IQ_STATUS valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java index 61780ec..1f8f863 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailResultModel.java @@ -17,11 +17,11 @@ public class ReconciliaDetailResultModel implements Serializable { private String partNo; - @ApiModelProperty(notes = "库存地编号") - private String zoneNo; + @ApiModelProperty(name = "库存地编号") + private String areaNo; - @ApiModelProperty(notes = "仓库存储区编号") - private String whNo; + @ApiModelProperty(notes = "存储区编号") + private String zoneNo; @ApiModelProperty(notes = "业务类型") private Integer busiTypeCode; @@ -29,20 +29,20 @@ public class ReconciliaDetailResultModel implements Serializable { @ApiModelProperty(notes = "IQ状态 正常异常") private Integer iQStatus; - @ApiModelProperty(notes = "单号") - private String orderNo; + @ApiModelProperty(notes = "关联单号") + private String refSrcOrderNo; - @ApiModelProperty(notes = "单据状态") - public Integer orderStatus; + @ApiModelProperty(notes = "关联单据状态") + public Integer refSrcOrderStatus; @ApiModelProperty(notes = "库存移动单号") - private String moveNo; + private String moveOrderNo; @ApiModelProperty(notes = "处理数量") private Double handleQty; @ApiModelProperty(notes = "移动单状态") - private Integer moveItemStatus; + private Integer moveOrderStatus; @ApiModelProperty(notes = "movetoerp状态") private Integer moveToERPStatus; @@ -55,4 +55,16 @@ public class ReconciliaDetailResultModel implements Serializable { private Integer oQStatus; + public ReconciliaDetailResultModel(String partNo,String areaNo,String zoneNo,Integer busiTypeCode,String refSrcOrderNo,Integer refSrcOrderStatus,String moveOrderNo,Double handleQty,Integer moveOrderStatus ){ + this.partNo = partNo; + this.areaNo = areaNo; + this.zoneNo = zoneNo; + this.busiTypeCode = busiTypeCode; + this.refSrcOrderNo = refSrcOrderNo; + this.refSrcOrderStatus = refSrcOrderStatus; + this.moveOrderNo = moveOrderNo; + this.handleQty = handleQty; + this.moveOrderStatus = moveOrderStatus; + } + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java index 5bbf1f7..d742422 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaDetailSummaryResultModel.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.wms; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -11,6 +12,7 @@ import java.io.Serializable; * @create 2022/5/31 0031 下午 16:52 */ @Data +@NoArgsConstructor @ApiModel("对账单查询model") public class ReconciliaDetailSummaryResultModel implements Serializable { @ApiModelProperty(name = "物料编号") @@ -18,7 +20,7 @@ public class ReconciliaDetailSummaryResultModel implements Serializable { @ApiModelProperty(name = "库存地编号") - private String zoneNo; + private String areaNo; @ApiModelProperty(name = "来源存储区") private String srcZoneNo; @@ -44,4 +46,60 @@ public class ReconciliaDetailSummaryResultModel implements Serializable { @ApiModelProperty(name = "创建时间") private String createDateTime; + + @ApiModelProperty(name = "关联单号") + public String refSrc; + + + @ApiModelProperty(name = "订单号") + public String orderNo; + + + public ReconciliaDetailSummaryResultModel(String partNo,String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,String refSrc,String orderNo){ + this.partNo = partNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.busiTypeCode = busiTypeCode; + this.orderStatus = orderStatus; + this.refSrc = refSrc; + this.orderNo = orderNo; + } + + public ReconciliaDetailSummaryResultModel(Double demandQty){ + this.demandQty = demandQty; + } + + public ReconciliaDetailSummaryResultModel(String partNo,String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,String orderNo,Double handleQty){ + this.partNo = partNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.busiTypeCode = busiTypeCode; + this.orderStatus = orderStatus; + this.orderNo = orderNo; + this.handleQty = handleQty; + } + public ReconciliaDetailSummaryResultModel(String partNo,String areaNo, String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,Double demandQty, Double handleQty){ + this.partNo = partNo; + this.areaNo = areaNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.busiTypeCode = busiTypeCode; + this.orderStatus = orderStatus; + this.demandQty = demandQty; + this.handleQty = handleQty; + } + + public ReconciliaDetailSummaryResultModel(String partNo, String srcZoneNo,String destZoneNo,Integer busiTypeCode,Integer orderStatus,Double demandQty, Double handleQty){ + this.partNo = partNo; + this.areaNo = areaNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.busiTypeCode = busiTypeCode; + this.orderStatus = orderStatus; + this.demandQty = demandQty; + this.handleQty = handleQty; + } + + + } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java index 3e692ec..a9bc7fb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/ReconciliaQueryModel.java @@ -20,8 +20,12 @@ public class ReconciliaQueryModel implements Serializable { @ApiModelProperty(notes = "仓库编号") private String whNo; + /** + * 库存地 + * 前端输入，sap中的字段 + */ @ApiModelProperty(notes = "库存地编号") - private String zoneNo; + private String areaNo; @ApiModelProperty(notes = "wms快照时间") private String wmsSnapshotTime; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index 9cf635d..12dc4b1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -159,4 +159,12 @@ public class WmsASNMasterDetails extends BaseBean { this.planDate = planDate; this.planTime = planTime; } + + public WmsASNMasterDetails(Double recQty,Double qty,String partNo,String orderNo ,String erpAreaNo){ + this.recQty = recQty; + this.qty = qty; + this.partNo = partNo; + this.orderNo = orderNo; + this.erpAreaNo = erpAreaNo; + } } 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 a381d13..28da699 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 @@ -838,4 +838,14 @@ public class WmsDocMovementDetails extends BaseBean { this.partNo = partNo; this.outQty = outQty; } + + public WmsDocMovementDetails(Double recQty,Double qty,String partNo,String orderNo,String srcZoneNo, String destZoneNo ,String areaNo){ + this.recQty = recQty; + this.qty = qty; + this.partNo = partNo; + this.orderNo = orderNo; + this.srcZoneNo = srcZoneNo; + this.destZoneNo = destZoneNo; + this.srcAreaNo = areaNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index 59aa838..6ffa005 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -296,4 +296,12 @@ public class WmsMoveToERP extends BaseBean { this.destAreaNo = destAreaNo; this.transQtySum = transQtySum; } + + public WmsMoveToERP( Long id, String orderNo, String refSrc, Long sid, Integer isSync) { + this.id = id; + this.orderNo = orderNo; + this.refSrc = refSrc; + this.shippingId = sid; + this.isSync = isSync; + } } 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 006abbd..40f6819 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 @@ -370,4 +370,12 @@ public class WmsPOMasterDetails extends BaseBean { this.sumRcQty = sumRcQty; } + public WmsPOMasterDetails(Double rcQty,Double qty,String partNo,String orderNo,String erpAreaNo){ + this.erpAreaNo = erpAreaNo; + this.rcQty = rcQty; + this.qty = qty; + this.partNo = partNo; + this.orderNo = orderNo; + } + }