Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -374,7 +374,7 @@ public class MesPcnEnumUtil {
         EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
         EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
         EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
-        BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
+        BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
         private String value;
         private String description;
 

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

@@ -6456,7 +6456,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FG_INSTOCK_SN_TYPE {
-        NORMAL(10, "NORMAL", "实物条码(正常)"),
+        NORMAL(10, "NORMAL", "正常"),
         FIRST_PIECE(20, "FIRST_PIECE", "首件"),
         MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"),
         TAIL_PIECE(40, "TAIL_PIECE", "末件");
@@ -6976,8 +6976,8 @@ public class WmsEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum APPROVAL_STATUS {
         APPROVE_PROCESSING(10, "APPROVE_PROCESSING", "审批中"),
-        APPROVE_COMPLETED(20, "APPROVE_COMPLETED", "已审批"),
+        APPROVE_COMPLETED(20, "APPROVE_COMPLETED", "审批通过"),
-        APPROVE_REFUSE(30, "APPROVE_REFUSE", "审批拒绝");
+        APPROVE_REFUSE(30, "APPROVE_REFUSE", "已驳回");
 
         private int value;
         private String code;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java

@@ -103,4 +103,8 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @Column(name = "SN_TYPE")
     @ApiParam("条码类型")
     private String snType;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam("客户发往地")
+    private String shippingFlag;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java

@@ -53,4 +53,8 @@ public class MesCustomer extends BaseBean implements Serializable {
     @Column(name = "TELEPHONE")
     @ApiParam("客户电话")
     private String telephone;
+
+    @Column(name = "SHIPPING_FLAG")
+    @ApiParam("客户发往地")
+    private String shippingFlag;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java

@@ -114,6 +114,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("条码类型")
     private String snType;
 
+    @Transient
+    @ApiParam("客户发往地")
+    private String shippingFlag;
+
     public MesPackage() {
     }
 

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

@@ -41,7 +41,7 @@ public class QmsStockSnExtBh extends BaseBean {
 
     @Column(name="BH_TYPE")
     @ApiParam("BH类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
     private Integer bhType;
 
     @Transient

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

@@ -56,7 +56,7 @@ public class WmsLogisticExpenseRecords extends BaseBean {
 
     @Column(name = "TRANSPORT_TYPE")
     @ApiParam(value = "运输方式")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class, refForeignKey = "value", value = "description")
     private Integer transportType;
 

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

@@ -43,6 +43,11 @@ public class WmsLogisticsCosts extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String placeOfOrigin;
 
+    @Column(name = "DESTINATION_WAREHOUSE")
+    @ApiParam(value = "目的仓库")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String destinationWarehouse;
+
     @Column(name = "SHIPPING_FLAG")
     @ApiParam(value = "发往地")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
@@ -60,7 +65,7 @@ public class WmsLogisticsCosts extends BaseBean {
 
     @Column(name = "TRANSPORT_TYPE")
     @ApiParam(value = "运输类型")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "NORMAL_ABNORMAL")
     @AnnoOutputColumn(refClass = WmsEnumUtil.NORMAL_ABNORMAL.class)
     private Integer transportType;
 

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

@@ -71,7 +71,7 @@ public class WmsLogisticsFreightApproval extends BaseBean {
     private String logisticsVendorNo;
 
     @Column(name = "TRANSPORT_TYPE")
-    @ApiParam(value = "运输方式")
+    @ApiParam(value = "运输类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRANSPORT_TYPE")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRANSPORT_TYPE.class)
     private Integer transportType;
@@ -99,11 +99,12 @@ public class WmsLogisticsFreightApproval extends BaseBean {
     @Column(name = "is_urgent")
     @ApiParam(value = "是否紧急")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
     private Integer isUrgent;
 
     public WmsLogisticsFreightApproval(WmsDocMovementMaster docMovementMaster) {
         this.orderNo = docMovementMaster.getOrderNo();
+        this.organizeCode = docMovementMaster.getOrganizeCode();
         this.busiType = docMovementMaster.getBusiType();
         this.organizeCode = docMovementMaster.getOrganizeCode();
         this.approvalStatus = WmsEnumUtil.APPROVAL_STATUS.APPROVE_PROCESSING.getValue();

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

@@ -51,4 +51,9 @@ public class WmsProviderFlag extends BaseBean {
     @ApiParam(value = "发往地编号")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String shippingFlag;
+
+    @Column(name = "SHIPPING_FLAG_NAME")
+    @ApiParam(value = "发往地编号")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String shippingFlagName;
 }

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

@@ -58,6 +58,11 @@ public class WmsShortLogisticsCosts extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     private String shippingFlag;
 
+    @Column(name = "DESTINATION_WAREHOUSE")
+    @ApiParam(value = "目的仓库")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String destinationWarehouse;
+
     @Column(name = "LOGISTICS_VENDOR_NO")
     @ApiParam(value = "物流供应商")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)

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

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 库存初始化表
@@ -114,4 +115,13 @@ public class WmsStockInitialize extends BaseBean {
     @AnnoOutputColumn(required = false)
     private Integer seqNo;
 
+    @Transient
+    @ApiParam(value = "确认标志")
+    private boolean confirm;
+
+
+    @Transient
+    @ApiParam(value = "物料-1，器具-2")
+    public String intiType;
+
 }

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

@@ -426,6 +426,7 @@ public class WmsStockSn extends BaseBean {
 
     @Transient
     @ApiParam("BH类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
     private Integer bhType;
 
     @Transient

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

@@ -82,6 +82,7 @@ public class WmsTestResultSummary extends BaseBean {
 
     @Transient
     @ApiParam("BH类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
     private Integer bhType;
 
     @Transient