新增逻辑修改

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

@@ -16,11 +16,11 @@ public class SwebEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_MASTER_STATUS {
-        CREATE(10, "CREATE","新建"),
-        RECEIPT(20, "RECEIPT","已发布"),
-        SURE(30, "SURE","已确认"),
-        PRINTED(40, "PRINTED","已打印"),
-        DELIVERY(50, "DELIVERY","已发货");
+        CREATE(10, "CREATE", "新建"),
+        RECEIPT(20, "RECEIPT", "已发布"),
+        SURE(30, "SURE", "已确认"),
+        PRINTED(40, "PRINTED", "已打印"),
+        DELIVERY(50, "DELIVERY", "已发货");
 
         private int value;
         private String code;
@@ -76,11 +76,11 @@ public class SwebEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_DETAILS_STATUS {
-        CREATE(10, "CREATE","新建"),
-        RECEIPT(20, "RECEIPT","已发布"),
-        SURE(30, "SURE","已确认"),
-        PRINTED(40, "PRINTED","已打印"),
-        DELIVERY(50, "DELIVERY","已发货");
+        CREATE(10, "CREATE", "新建"),
+        RECEIPT(20, "RECEIPT", "已发布"),
+        SURE(30, "SURE", "已确认"),
+        PRINTED(40, "PRINTED", "已打印"),
+        DELIVERY(50, "DELIVERY", "已发货");
 
         private int value;
         private String code;
@@ -173,14 +173,16 @@ public class SwebEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ORDER_TYPE {
-        STANDARD(10, "标准包装"),
-        NON_STANDARD(20, "非标准包装");
+        STANDARD(10, "STANDARD", "标准包装"),
+        NON_STANDARD(20, "NON_STANDARD", "非标准包装");
 
         private int value;
+        private String code;
         private String description;
 
-        ORDER_TYPE(int value, String description) {
+        ORDER_TYPE(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -188,6 +190,10 @@ public class SwebEnumUtil {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebOrderDeliveryLog.java

@@ -30,17 +30,17 @@ public class SwebOrderDeliveryLog extends BaseBean {
 
     @Column(name = "ORDER_ITEM_NO")
     @ApiParam("单据明细编号")
-    public String orderItemNo;
+    private String orderItemNo;
 
     @Column(name = "CAR_NO")
     @ApiParam(value = "发运车号")
-    public String carNo;
+    private String carNo;
 
     @Column(name = "CONTACT")
     @ApiParam("联系人")
-    public String contact;
+    private String contact;
 
     @Column(name = "CONTACT_TEL")
     @ApiParam(value = "联系人电话")
-    public String contactTel;
+    private String contactTel;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPackage.java

@@ -31,18 +31,18 @@ public class SwebPackage extends BaseBean {
 
     @Column(name="PACKAGE_NO")
     @ApiParam("包装编号")
-    public String packageNo;
+    private String packageNo;
 
     @Column(name="PACKAGE_TYPE_ID")
     @ApiParam(value = "包装类型", example = "1")
-    public Integer packTypeId;
+    private Integer packTypeId;
 
     @Column(name="PARENT_PACKAGE_NO")
     @ApiParam("上级包装编号")
-    public String parentPackageNo;
+    private String parentPackageNo;
 
     @ColumnDefault("0")
     @Column(name="PACKAGE_QTY")
     @ApiParam(value = "包装件数", example = "1")
-    public Integer packageQty;
+    private Integer packageQty;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseChangeLog.java

@@ -31,7 +31,7 @@ public class SwebPurchaseChangeLog extends BaseBean {
 
     @Column(name = "ORDER_NO")
     @ApiParam("单据明细编号")
-    public String orderNo;
+    private String orderNo;
 
     @ApiParam(value = "零件号")
     @Column(name = "PART_NO")
@@ -44,7 +44,7 @@ public class SwebPurchaseChangeLog extends BaseBean {
     @Column(name = "QTY")
     @ApiParam("零件数量")
     @ColumnDefault("0")
-    public Double qty;
+    private Double qty;
 
     @Column(name = "REMARK")
     @ApiParam("备注")

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrder.java

@@ -48,72 +48,72 @@ public class SwebPurchaseOrder extends BaseBean {
 
     @ApiParam(value = "订单类型", example = "1")
     @Column(name = "ORDER_TYPE")
-    public Integer orderType;
+    private Integer orderType;
 
     @ApiParam(value = "订单状态", example = "1")
     @Column(name = "ORDER_STATUS")
-    public Integer orderStatus;
+    private Integer orderStatus;
 
     @Column(name = "PARENT_PACKAGE_NO")
     @ApiParam("上级包装编号")
-    public String parentPackageNo;
+    private String parentPackageNo;
 
     @Column(name = "DOCK")
     @ApiParam("道口")
-    public String dock;
+    private String dock;
 
     @Column(name = "ERP_WAREHOUSE")
     @ApiParam(value = "库存地")
-    public String erpWarehouse;
+    private String erpWarehouse;
 
     @Column(name = "PO_STATUS")
     @ApiParam(value = "PO状态", example = "1")
-    public Integer poStatus;
+    private Integer poStatus;
 
     @Column(name = "SHIP_TIME")
     @ApiParam(value = "发运时间")
-    public String shipTime;
+    private String shipTime;
 
     @Column(name = "PUBLISH_TIME")
     @ApiParam(value = "发布时间")
-    public String publishTime;
+    private String publishTime;
 
     @Column(name = "DELIVERY_TIME")
     @ApiParam(value = "交货时间")
-    public String deliveryTime;
+    private String deliveryTime;
 
     @Column(name = "REC_TIME")
     @ApiParam(value = "收货时间")
-    public String recTime;
+    private String recTime;
 
     @Column(name = "IS_SYN")
     @ApiParam(value = "是否收货", example = "2")
-    public Integer isSyn;
+    private Integer isSyn;
 
     @Column(name = "ORDER_TIME")
     @ApiParam(value = "订单时间")
-    public String orderTime;
+    private String orderTime;
 
     @Column(name = "REF_ORDER_NO")
     @ApiParam(value = "关联单号")
-    public String refOrderNo;
+    private String refOrderNo;
 
     @Column(name = "EXPECTED_TIME")
     @ApiParam(value = "预计到货时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    public String expectedTime;
+    private String expectedTime;
 
     @Column(name = "REF_NO")
     @ApiParam(value = "合同号")
-    public String refNo;
+    private String refNo;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value = "预计到货时间 开始时间")
-    public String expectedTimeStart;
+    private String expectedTimeStart;
 
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiParam(value = "预计到货时间 结束时间")
-    public String expectedTimeEnd;
+    private String expectedTimeEnd;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -31,7 +31,7 @@ public class SwebPurchaseOrderDetails extends BaseBean {
 
     @Column(name = "ORDER_NO")
     @ApiParam("单据号")
-    public String orderNo;
+    private String orderNo;
 
     @ApiParam("供应商编号")
     @Column(name = "VENDOR_CODE")
@@ -169,7 +169,7 @@ public class SwebPurchaseOrderDetails extends BaseBean {
 
     @Column(name = "CONFIRM_TIME")
     @ApiParam(value = "确认时间")
-    public String confirmTime;
+    private String confirmTime;
 
     @Column(name = "DELIVERY_TIME")
     @ApiParam(value = "交货时间")
@@ -177,5 +177,5 @@ public class SwebPurchaseOrderDetails extends BaseBean {
 
     @Column(name = "REF_NO")
     @ApiParam(value = "合同号")
-    public String refNo;
+    private String refNo;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java

@@ -32,7 +32,7 @@ public class SwebPurchaseOrderSn extends BaseBean {
 
     @Column(name = "ORDER_NO")
     @ApiParam("单据明细编号")
-    public String orderNo;
+    private String orderNo;
 
     @Column(name = "PART_NO")
     @ApiParam(value = "零件号")
@@ -81,15 +81,15 @@ public class SwebPurchaseOrderSn extends BaseBean {
 
     @Column(name = "CHECK_CODE")
     @ApiParam(value = "检验编号")
-    public String checkCode;
+    private String checkCode;
 
     @Column(name = "STOVE_NO")
     @ApiParam(value = "炉批号")
-    public String stoveNo;
+    private String stoveNo;
 
     @Column(name = "BATCH_NO")
     @ApiParam(value = "批次号")
-    public String batchNo;
+    private String batchNo;
 
     @ApiParam("是否同步")
     @Column(name = "IS_SYN")
@@ -97,13 +97,13 @@ public class SwebPurchaseOrderSn extends BaseBean {
 
     @Column(name = "REC_TIME")
     @ApiParam(value = "收货时间")
-    public String recTime;
+    private String recTime;
 
     @Column(name = "PACKAGE_NO")
     @ApiParam(value = "包装编号")
-    public String packageNo;
+    private String packageNo;
 
     @Transient
     @ApiParam(value = "是否可编辑（前端使用）")
-    public boolean isSet = false;
+    private boolean isSet = false;
 }

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertEnterModel.java

@@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.sweb.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 订单批量新增输入模型
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-20 13:13
+ * @Modify:
+ **/
+@Data
+public class SwebPOBatchInsertEnterModel extends BaseBean {
+
+    @ApiParam("单据号")
+    private String orderNo;
+
+    @ApiParam("供应商编号")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam(value = "订单类型", example = "10")
+    private Integer orderType;
+
+    @ApiParam(value = "库存地")
+    private String erpWarehouse;
+
+    @ApiParam(value = "合同号")
+    private String refNo;
+
+    @ApiParam(value = "零件列表")
+    private List<SwebPOBatchInsertItemEnterModel> partItems;
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOBatchInsertItemEnterModel.java

@@ -0,0 +1,103 @@
+package cn.estsh.i3plus.pojo.sweb.modelbean;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.ColumnDefault;
+
+import java.io.Serializable;
+
+/**
+ * @Description : 订单批量新增零件输入模型
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-04-20 13:13
+ * @Modify:
+ **/
+@Data
+public class SwebPOBatchInsertItemEnterModel implements Serializable {
+
+    @ApiParam(value = "零件号")
+    private String partNo;
+
+    @ApiParam(value = "零件名称")
+    private String partName;
+
+    @ApiParam("供应商编号")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    private String vendorName;
+
+    @ApiParam(value = "订单类型", example = "10")
+    private Integer orderType = 0;
+
+    @ApiParam(value = "行项目状态", example = "1")
+    private Integer itemStatus;
+
+    @ApiParam(value = "箱数", example = "0")
+    private Integer boxQty = 0;
+
+    @ApiParam(value = "默认包装规格", example = "0")
+    private Double snpQty = 0d;
+
+    @ApiParam(value = "打印数", example = "0")
+    private Double printQty = 0d;
+
+    @ApiParam(value = "收货数量", example = "0")
+    private Double recQty = 0d;
+
+    @ApiParam(value = "已收箱数", example = "0")
+    private Double recBoxQty = 0d;
+
+    @ApiParam(value = "上传数量", example = "0")
+    private Double uploadQty = 0d;
+
+    @ApiParam("库存地")
+    private String erpWarehouse;
+
+    @ApiParam(value = "订单数量", example = "0")
+    private Double refQty = 0d;
+
+    @ColumnDefault("0")
+    @ApiParam(value = "需求数", example = "0")
+    private Double orderQty = 0d;
+
+    @ApiParam(value = "发运数量", example = "0")
+    private Double shipQty = 0d;
+
+    @ApiParam(value = "打印时间")
+    private String printTime;
+
+    @ApiParam("打印用户code")
+    private String printUserCode;
+
+    @ApiParam("是否为钢卷料")
+    private Integer isSteel;
+
+    @ApiParam(value = "预计到货日期")
+    private String expectedTime;
+
+    @ApiParam("备注")
+    private String remark;
+
+    @ApiParam(value = "入库数量", example = "0")
+    private Double instockQty = 0d;
+
+    @ApiParam(value = "入库箱数", example = "0")
+    private Double instockBoxQty = 0d;
+
+    @ApiParam(value = "不良数", example = "0")
+    private Double ncQty = 0d;
+
+    @ApiParam(value = "不良箱数", example = "0")
+    private Double ncBoxQty = 0d;
+
+    @ApiParam(value = "行号", example = "0")
+    private Integer itemNo;
+
+    @ApiParam(value = "确认时间")
+    private String confirmTime;
+
+    @ApiParam(value = "交货时间")
+    private String deliveryTime;
+}