Merge remote-tracking branch 'origin/test' into test

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @author dominic
+ * @date 2020/11/18 21:52
+ * @desc 包装明细
+ */
+@Data
+@Api("包装明细")
+public class PackageDetailModel {
+
+    @ApiParam("料架号")
+    private String ctNo;
+
+    @ApiParam("容器位置编号")
+    private String ctLocationNo;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料编号")
+    private String partNo;
+
+    public PackageDetailModel(String ctNo, String ctLocationNo, String serialNumber, String partNo) {
+        this.ctNo = ctNo;
+        this.ctLocationNo = ctLocationNo;
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+    }
+
+    public PackageDetailModel() {
+    }
+
+    ;
+}

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

@@ -75,4 +75,8 @@ public class BasCustomer extends BaseBean {
     @ApiParam(value = "安全库存")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
     private Double safetyStock;
+
+    public double getSafetyStockVal() {
+        return this.safetyStock == null ? 0.0d : this.safetyStock;
+    }
 }

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

@@ -324,10 +324,10 @@ public class WmsPOMasterDetails extends BaseBean {
         this.qty = qty;
     }
 
-    public WmsPOMasterDetails(String orderNo, String erpSrcNo, Integer item,String partNo,String partNameRdd, Double qty,
+    public WmsPOMasterDetails(String orderNo, String remark, Integer item,String partNo,String partNameRdd, Double qty,
                                 Double rcQty, Integer itemStatus) {
         this.orderNo = orderNo;
-        this.erpSrcNo = erpSrcNo;
+        this.remark = remark;
         this.item = item;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -110,7 +110,8 @@ public class WmsQCDetails extends BaseBean {
                         Double qty, String unit, String orderNo,
                         Integer itemStatus, String remark, Double factQty,
                         Double passQty, Double rejectQty,
-                        Integer orderStatus, String vendorNo, String vendorDesc) {
+                        Integer orderStatus, String vendorNo, String vendorDesc,
+                        String createUser, String createDatetime,String modifyUser,String modifyDatetime) {
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
@@ -126,6 +127,10 @@ public class WmsQCDetails extends BaseBean {
         this.orderStatus = orderStatus;
         this.vendorNo = vendorNo;
         this.vendorDesc = vendorDesc;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
     }
 
     public WmsQCDetails(String partNo, String partNameRdd, String item,