1655 生产领料单增加替代料

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -6363,4 +6363,55 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+
+    /**
+     * 采购计划历史状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PURCHASE_PLAN_HISTORY_STATUS {
+        CREATE(10, "CREATE", "采购订单创建"),
+        PUBLISH(20, "PUBLISH", "采购订单发布"),
+        VERDOR_CONFIRM(30, "VERDOR_CONFIRM", "供应商确认订单"),
+        VERDOR_PRINT(40, "VERDOR_PRINT", "供应商打印"),
+        VERDOR_SNED(50, "VERDOR_SNED", "供应商发货"),
+        RECEIPT_FINISH(60, "RECEIPT_FINISH", "收货完成"),
+        FAIL(70, "FAIL", "质检完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PURCHASE_PLAN_HISTORY_STATUS(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java

@@ -163,6 +163,32 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("集装箱号")
     private String containerNo;
 
+
+    @Transient
+    @ApiParam("采购订单状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer purchaseItemStatus;
+
+    @Transient
+    @ApiParam("供应商")
+    private String vendorNo;
+
+    @Transient
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @Transient
+    @ApiParam("开始时间")
+    private String planStratDate;
+
+    @Transient
+    @ApiParam("结束时间")
+    private String planEndDate;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
     public Double getSnpVal() {
         return snp;
     }
@@ -185,4 +211,38 @@ public class WmsPOMasterDetails extends BaseBean {
         this.erpAreaNo = erpAreaNo;
         this.organizeCode = organizeCode;
     }
+
+    public WmsPOMasterDetails(
+            String organizeCode,
+            String orderNo,
+            Integer purchaseItemStatus,
+            String planDate,
+            String planTime,
+            String partNo,
+            String partNameRdd,
+            Double qty,
+            Double rcQty,
+            String vendorNo,
+            String createUser,
+            String createDatetime,
+            String modifyUser,
+            String modifyDatetime,
+            String remark
+    ){
+        this.organizeCode = organizeCode;
+        this.orderNo = orderNo;
+        this.purchaseItemStatus = purchaseItemStatus;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.rcQty = rcQty;
+        this.vendorNo = vendorNo;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+        this.remark = remark;
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPurchasePlanHistory.java

@@ -0,0 +1,62 @@
+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.ApiOperation;
+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 javax.persistence.Transient;
+
+/**
+ * @Description : 采购计划历史
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-04-15 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PURCHASE_PLAN_HISTORY")
+@Api("采购计划历史")
+public class WmsPurchasePlanHistory extends BaseBean {
+    private static final long serialVersionUID = -8147353212724381079L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    private String orderNo;
+
+    @Column(name = "ITEM_STATUS")
+    @ApiParam(value = "状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PURCHASE_PLAN_HISTORY_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer itemStatus;
+
+    @Column(name = "CAR_NO")
+    @ApiParam("车牌号")
+    private String carNo;
+
+    @Column(name = "CONTACT")
+    @ApiParam("联系人")
+    private String contact;
+
+    @Column(name = "CONTACT_TEL")
+    @ApiParam("联系电话")
+    private String contactTel;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPurchasePlanHistoryRepository.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.WmsPurchasePlanHistory;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 采购计划历史dao层
+ * @Reference :
+ * @Author : puxiao.liao
+ * @CreateDate : 2020-04-15 10:30
+ * @Modify:
+ **/
+@Repository
+public interface WmsPurchasePlanHistoryRepository extends BaseRepository<WmsPurchasePlanHistory, Long> {
+}