diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 4bf2e60..2c5fcb1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -11,6 +11,98 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class PtlEnumUtil { /** + * 流程状态-触发类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRIGGER_TYPE { + INNER_TRIGGER(10, "内部触发"), + OUTER_TRIGGER(20, "外部触发"); + + private int value; + private String description; + + TRIGGER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 触发事件 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ROUNT_STATUS_TRIGGER_EVENT { + SUCCESS("SUCCESS", "是"), + FAILURE("FAILURE", "否"); + + private String value; + private String description; + + ROUNT_STATUS_TRIGGER_EVENT(String value, String description) { + this.value = value; + this.description = description; + } + + public static ROUNT_STATUS_TRIGGER_EVENT getByValue(String value) { + for (ROUNT_STATUS_TRIGGER_EVENT triggerEvent : values()) { + if (triggerEvent.getValue().equals(value)) { + return triggerEvent; + } + } + return null; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 组件状态类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum STATUS_TYPE { + START(10, "START", "开始状态"), + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"); + + private int value; + private String code; + private String description; + + STATUS_TYPE(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; + } + } + + /** * 作业流程类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -46,21 +138,30 @@ public class PtlEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTE_EVENT { - TRIGGER(10, "trigger", "触发"), - ENTRY(20, "entry", "进入状态"), - EXIT(30, "exit", "离开状态"); + TRIGGER("10", "trigger", "触发"), + ENTRY("20", "entry", "进入状态"), + EXIT("30", "exit", "离开状态"); - private int value; + private String value; private String code; private String description; - ROUTE_EVENT(int value, String code, String description) { + ROUTE_EVENT(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public int getValue() { + public static ROUTE_EVENT getByValue(String value) { + for (ROUTE_EVENT routeEvent : values()) { + if (routeEvent.getValue().equals(value)) { + return routeEvent; + } + } + return null; + } + + public String getValue() { return value; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index cab76d0..43cd127 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -554,21 +554,21 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ROUTE_EVENT { - TRIGGER(10, "trigger", "触发"), - ENTRY(20, "entry", "进入状态"), - EXIT(30, "exit", "离开状态"); + TRIGGER("10", "trigger", "触发"), + ENTRY("20", "entry", "进入状态"), + EXIT("30", "exit", "离开状态"); - private int value; + private String value; private String code; private String description; - ROUTE_EVENT(int value, String code, String description) { + ROUTE_EVENT(String value, String code, String description) { this.value = value; this.code = code; this.description = description; } - public int getValue() { + public String getValue() { return value; } @@ -933,8 +933,9 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STATUS_TYPE { START(10, "START", "开始状态"), - FINISH(20, "FINISH", "完成状态"), - TERMINATE(30, "TERMINATE", "中断状态"); + EXECUTING(20, "EXECUTING", "执行中状态"), + TERMINATE(30, "TERMINATE", "中断状态"), + FINISH(40, "FINISH", "完成状态"); private int value; private String code; 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 5a5ff71..d12bf90 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 @@ -240,7 +240,7 @@ public class WmsEnumUtil { /** - * 单据主表状态(ASN,PO,MOVE,QC) + * 单据主表状态(ASN,PO,MOVE,QC,SO) */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { @@ -1283,8 +1283,8 @@ public class WmsEnumUtil { public enum CS_STRATEGY_TYPE { PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), - ZORE_STOCK(130, "零库存"); - + ZORE_STOCK(130, "零库存"), + MATERIAL_COVERAGE(140, "物料覆盖"); private int value; private String description; @@ -1328,7 +1328,8 @@ public class WmsEnumUtil { AJUST_INVENTORY(50, "库存调整盘点"), PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), - ZORE_STOCK(130, "零库存"); + ZORE_STOCK(130, "零库存"), + MATERIAL_COVERAGE(140, "物料覆盖"); private int value; private String description; @@ -6137,4 +6138,58 @@ public class WmsEnumUtil { return tmp; } } -} \ No newline at end of file + + /** + * 移库单移动类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SO_ORDER_TYPE { + SALES(10, "SALES", "销售"); + + private int value; + private String code; + private String description; + + SO_ORDER_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java new file mode 100644 index 0000000..921c69f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 生产工单导入 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-03-30 13:42 + * @Modify: + **/ +@Data +@Api(value="生产工单导入",description = "生产工单导入") +public class MesWorkOrderModel { + + @ApiParam("工单号") + @AnnoOutputColumn(required = false) + private String orderNo; + + @ApiParam("物料号") + @AnnoOutputColumn + private String partNo; + + @ApiParam("客户产线代码") + @AnnoOutputColumn + private String custProdLineCode; + + @ApiParam("数量") + @AnnoOutputColumn + private Double qty; + + @ApiParam("开始时间") + @AnnoOutputColumn + private String startTime; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java new file mode 100644 index 0000000..56fdace --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteModuleParam.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.ptl.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; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_ROUTE_MODULE_PARAM") +@EqualsAndHashCode(callSuper = true) +@Api("PTL_流程组件调用参数") +public class PtlRouteModuleParam extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3036415977457877114L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "AMG_ID") + @ApiParam("组件集编号") + private Long amgId; + + @Column(name = "AM_CODE") + @ApiParam("组件代码") + private String amCode; + + @Column(name = "PARAM_CODE") + @ApiParam("参数代码") + private String paramCode; + + @Column(name = "PARAM_VALUE") + @ApiParam("参数值") + private String paramValue; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java new file mode 100644 index 0000000..f08d7da --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleGroupModel.java @@ -0,0 +1,36 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaRouteModuleParam; +import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteModuleParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 流程明细Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("流程明细Model") +public class ActionModuleGroupModel implements Serializable { + + private static final long serialVersionUID = 3569055511035396175L; + + @ApiParam("组件代码") + private String amCode; + + @ApiParam("执行顺序") + private Integer seq; + + @ApiParam("流程组件参数集合") + private List routeModuleParamList; + + @ApiParam("区域流程组件参数集合") + private List areaRouteModuleParamList; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java new file mode 100644 index 0000000..e533406 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/BussinessProcessModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description : 作业流程Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("作业流程Model") +public class BussinessProcessModel implements Serializable { + + private static final long serialVersionUID = 148029163662900001L; + + @ApiParam("流程代码") + private String routeCode; + + @ApiParam("GOJS位置") + private String position; + + @ApiParam("流程明细Model集合") + private List processDetailModelList; + + @ApiParam("区域代码") + private String areaNo; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java new file mode 100644 index 0000000..3f42664 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ProcessDetailModel.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description : 流程明细Model + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-04-10 13:27 + * @Modify: + **/ +@Data +@Api("流程明细Model") +public class ProcessDetailModel implements Serializable { + + private static final long serialVersionUID = 3569055511035396175L; + + @ApiParam("状态代码") + private String statusCode; + + @ApiParam("状态名称") + private String statusName; + + @ApiParam("触发类型") + private Integer triggerType; + + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @ApiParam("组件集MAP") + private Map> actionModuleGroupMap; + + @ApiParam("下个状态点MAP") + private Map nextStatusMap; + + @ApiParam("触发调用") + private Long actionAmgId; + + @ApiParam("进入状态调用") + private Long inAmgId; + + @ApiParam("离开状态调用") + private Long outAmgId; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java new file mode 100644 index 0000000..227c5ef --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleParamRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActionModuleParam; + +/** + * @author wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlActionModuleParamRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java new file mode 100644 index 0000000..81c64ba --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteModuleParamRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteModuleParam; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +public interface PtlRouteModuleParamRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 3561345..a6845a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -100,4 +100,14 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "备注") private String remake; + + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam(value = "已盘物料") + @Column(name="INVENTORY_MATERIAL") + private String inventoryMaterial; + + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam(value = "已盘库位") + @Column(name="INVENTORY_LOCATION") + private String inventoryLocation; } 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 88f3576..0b173cb 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 @@ -169,6 +169,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "指定生产日期") private String assignDateCode; + @Column(name = "SO_ORDER_NO") + @ApiParam(value = "销售单据号") + private String soOrderNo; + @Transient @ApiParam("实际批次") private String actualLot; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java new file mode 100644 index 0000000..20e8f31 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoDetails.java @@ -0,0 +1,70 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 销售订单明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 13:30 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_SO_DETAILS") +@Api("销售订单明细表") +@ToString +public class WmsDocSoDetails extends BaseBean { + private static final long serialVersionUID = -8900949569711082994L; + + @Column(name = "ORDER_NO") + @ApiParam(value = "单据号") + private String orderNo; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "SNP_QTY") + @ApiParam(value = "标准包装", example = "1") + private Double snpQty; + + @Column(name = "ITEM_STATUS") + @ApiParam(value = "状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") + private Integer itemStatus; + + @Column(name = "QTY", columnDefinition = "decimal(18,8)") + @ColumnDefault("0") + @ApiParam(value = "需求数量", example = "0") + public Double qty; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java new file mode 100644 index 0000000..863ea9c --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocSoMaster.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 销售订单主表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 13:19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_DOC_SO_MASTER") +@Api("销售订单主表") +@ToString +public class WmsDocSoMaster extends BaseBean { + + private static final long serialVersionUID = 8250843929041855006L; + + @Column(name = "ORDER_NO") + @ApiParam(value = "单据号") + private String orderNo; + + @Column(name = "ORDER_TYPE") + @ApiParam("订单类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.SO_ORDER_TYPE.class, refForeignKey = "value", value = "description") + public Integer orderType; + + @Column(name = "ORDER_STATUS") + @ApiParam(value = "订单状态", example = "1") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + public Integer orderStatus; + + @Column(name = "CUST_CODE") + @ApiParam(value = "客户编号") + private String custCode; + + @Column(name = "CUST_DESC") + @ApiParam(value = "客户全称") + private String custDesc; + + @Column(name = "CUST_DELIVERY_CODE") + @ApiParam(value = "客户发往地代码") + private String custDeliveryCode; + + @Column(name = "FLAG_NAME") + @ApiParam(value = "客户发往地名称") + private String flagName; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java index c1013d5..bc5e86b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java @@ -301,4 +301,58 @@ public class WmsTmsShippingExtDetail extends BaseBean { return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); } + public WmsTmsShippingExtDetail(WmsDocMovementDetails docMovementDetails,String moveNo) { + this.moveNo = moveNo; + this.partNo = docMovementDetails.getPartNo(); + this.partNameRdd = docMovementDetails.getPartNameRdd(); + this.item = docMovementDetails.getItem(); + this.qty =docMovementDetails.getQty(); + this.unit = docMovementDetails.getUnit(); + this.orderNo = docMovementDetails.getOrderNo(); + this.srcWhNo = docMovementDetails.getSrcWhNo(); + this.srcZoneNo = docMovementDetails.getSrcZoneNo(); + this.srcLocateNo = docMovementDetails.getSrcLocateNo(); + this.destWhNo = docMovementDetails.getDestWhNo(); + this.destZoneNo = docMovementDetails.getDestZoneNo(); + this.destLocateNo = docMovementDetails.getDestLocateNo(); + this.printQty = docMovementDetails.getPrintQty(); + this.planDate = docMovementDetails.getPlanDate(); + this.planTime = docMovementDetails.getPlanTime(); + this.srcNo = docMovementDetails.getSrcNo(); + this.itemStatus = docMovementDetails.getItemStatus(); + this.isFree = docMovementDetails.getIsFree(); + this.remark = docMovementDetails.getRemark(); + this.pickQty = docMovementDetails.getPickQty(); + this.outQty = docMovementDetails.getOutQty(); + this.recQty = docMovementDetails.getRecQty(); + this.moveQty = docMovementDetails.getMoveQty(); + this.taskGenerateQty = docMovementDetails.getTaskGenerateQty(); + this.srcAreaNo = docMovementDetails.getSrcAreaNo(); + this.destAreaNo = docMovementDetails.getDestAreaNo(); + this.lotNo = docMovementDetails.getLotNo(); + this.srcItem = docMovementDetails.getSrcItem(); + this.custOrderNo = docMovementDetails.getCustOrderNo(); + this.assignDateCode = docMovementDetails.getAssignDateCode(); + this.actualLot = docMovementDetails.getActualLot(); + this.actualQty = docMovementDetails.getActualQty(); + this.recommondLot = docMovementDetails.getRecommondLot(); + this.recommondLocateNo = docMovementDetails.getRecommondLocateNo(); + this.isSet = docMovementDetails.getIsSet(); + this.dateCode = docMovementDetails.getDateCode(); + this.inputMoveQty = docMovementDetails.getInputMoveQty(); + this.snp = docMovementDetails.getSnp(); + this.detailsSnCount = docMovementDetails.getDetailsSnCount(); + this.restQty = docMovementDetails.getRestQty(); + this.isTask = docMovementDetails.getIsTask(); + this.orderMasterStatus = docMovementDetails.getOrderMasterStatus(); + this.printStatus = docMovementDetails.getPrintStatus(); + this.priority = docMovementDetails.getPriority(); + this.sumQty = docMovementDetails.getSumQty(); + this.sumPickQty = docMovementDetails.getSumPickQty(); + this.executeStatus = docMovementDetails.getExecuteStatus(); + this.lockVersion = docMovementDetails.getLockVersion(); + this.moveType = docMovementDetails.getMoveType(); + this.busiType = docMovementDetails.getBusiType(); + this.isSn = docMovementDetails.getIsSn(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java index 8c415bd..5c40810 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java @@ -145,4 +145,31 @@ public class WmsTmsShippingExtSn extends BaseBean { this.countBox = countBox; this.partNo = partNo; } + + public WmsTmsShippingExtSn(String moveNo,WmsDocMovementSn docMovementSn) { + this.moveNo = moveNo; + this.orderNo = docMovementSn.getOrderNo(); + this.item = docMovementSn.getItem(); + this.partNo = docMovementSn.getPartNo(); + this.partNameRdd = docMovementSn.getPartNameRdd(); + this.qty = docMovementSn.getQty(); + this.unit = docMovementSn.getUnit(); + this.snStatus = docMovementSn.getSnStatus(); + this.sn = docMovementSn.getSn(); + this.vendorNo = docMovementSn.getVendorNo(); + this.snType = docMovementSn.getSnType(); + this.isSet = docMovementSn.getIsSet(); + this.destLocateNo = docMovementSn.getDestLocateNo(); + this.srcLocateNo = docMovementSn.getSrcLocateNo(); + this.dateCode = docMovementSn.getDateCode(); + this.inputMoveQty = docMovementSn.getInputMoveQty(); + this.planDate = docMovementSn.getPlanDate(); + this.planTime = docMovementSn.getPlanTime(); + this.erpWhNo = docMovementSn.getErpWhNo(); + this.itemStatus = docMovementSn.getItemStatus(); + this.customerPartNo = docMovementSn.getCustomerPartNo(); + this.parentReturnPart = docMovementSn.getParentReturnPart(); + this.templateNo = docMovementSn.getTemplateNo(); + this.countBox = docMovementSn.getCountBox(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.java new file mode 100644 index 0000000..6d47563 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoDetailsRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsDocSoDetails; + +/** + * @Description : 销售订单明细表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 14:53 + * @Modify: + **/ +public interface WmsDocSoDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.java new file mode 100644 index 0000000..e09b4d7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDocSoMasterRepository.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.WmsDocSoMaster; +import org.springframework.stereotype.Repository; + +/** + * @Description : 销售订单主表 + * @Reference : + * @Author : jimmy.zeng + * @CreateDate : 2020-04-13 14:52 + * @Modify: + **/ +@Repository +public interface WmsDocSoMasterRepository extends BaseRepository { +} 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 c879e97..745b319 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 @@ -3044,4 +3044,42 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result; } + + /** + * SO订单主表信息 分页查询 + * + * @param wmsDocSoMaster + * @return + */ + public static DdlPackBean packHqlWmsDocSoMaster(WmsDocSoMaster wmsDocSoMaster) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringRightLikerPack(wmsDocSoMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoMaster.getCustCode(), "custCode", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoMaster.getCustDeliveryCode(), "custDeliveryCode", result); + DdlPreparedPack.getNumEqualPack(wmsDocSoMaster.getOrderStatus(), "orderStatus", result); + getStringBuilderPack(wmsDocSoMaster, result); + + return result; + } + + /** + * SO订单明细表 分页查询 + * + * @param wmsDocSoDetails + * @return + */ + public static DdlPackBean packHqlWmsDocSoDetails(WmsDocSoDetails wmsDocSoDetails) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsDocSoDetails.getPartNameRdd(), "partNameRdd", result); + + getStringBuilderPack(wmsDocSoDetails, result); + + return result; + } }