【1585 销售订单管理-销售订单维护】

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 {
@@ -5951,4 +5951,58 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 移库单移动类型
+     */
+    @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);
+        }
+    }
 }

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;
+
+}

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;

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;
+}

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;
+
+
+}

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<WmsDocSoDetails, Long> {
+}

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<WmsDocSoMaster, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -2921,4 +2921,42 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsTransportRule, 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;
+    }
 }