流程管家：单据完成提交所有待提交移动单；只推送当前移动单

PDA收货组件：改数后删除历史记录BUG修复

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

@@ -43,7 +43,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "ASN_STATUS")
     @ApiParam(value = "状态", example = "0")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     public Integer asnStatus;
 
     @Column(name = "VENDOR_NO")
@@ -68,7 +68,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isTask;
 
     @ApiParam("ASN详情列表")
@@ -169,18 +169,19 @@ public class WmsASNMaster extends BaseBean {
 
     @Transient
     @ApiParam("收货状态")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class, refForeignKey = "value", value = "description")
     private String recStatus;
 
     @Transient
     @ApiParam("项目")
     private String prodCfgTypeCode;
 
-    public  WmsASNMaster(){}
+    public WmsASNMaster() {
+    }
 
-    public  WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNameRdd,
+    public WmsASNMaster(String orderNo, Integer asnStatus, String vendorNo, String partNo, String partNameRdd,
-                                       Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType,
+                        Double sumQty, Double sumRecQty, String planDate, String planTime, Double diffQty, String orderType,
-                                       String recStatus){
+                        String recStatus) {
 
         this.orderNo = orderNo;
         this.asnStatus = asnStatus;
@@ -196,5 +197,7 @@ public class WmsASNMaster extends BaseBean {
         this.recStatus = recStatus;
     }
 
-
+    public int getAsnStatusVal() {
+        return this.asnStatus == null ? 0 : this.asnStatus;
+    }
 }

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

@@ -45,7 +45,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "MOVE_TYPE")
     @ApiParam("移动类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description")
     public Integer moveType;
     /**
      * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
@@ -54,7 +54,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "BUSI_TYPE")
     @ApiParam("业务类型")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
     public Integer busiType;
 
     /**
@@ -63,7 +63,7 @@ public class WmsDocMovementMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     public Integer orderStatus;
 
     @Column(name = "CUST_NO")
@@ -95,7 +95,7 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isTask;
 
     @Column(name = "PRIORITY")
@@ -123,7 +123,7 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Column(name = "IS_PART")
     @ApiParam(value = "是否散件", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     private Integer isPart;
 
     @Column(name = "SRC_WH_NO")
@@ -162,7 +162,7 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("类型名称")
     public String busiTypeName;
 
-//    public Integer getIsSn() {
+    public int getOrderStatusVal() {
-////        return isSn == null ? 0 : this.getIsSn();
+        return this.orderStatus == null ? 0 : this.orderStatus;
-////    }
+    }
 }

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

@@ -140,4 +140,8 @@ public class WmsPOMaster extends BaseBean {
     @Transient
     @ApiParam("前端信息")
     private String message;
+
+    public int getPoStatusVal() {
+        return this.poStatus == null ? 0 : this.poStatus;
+    }
 }

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

@@ -42,7 +42,7 @@ public class WmsQCMaster extends BaseBean {
      */
     @Column(name = "ORDER_TYPE")
     @ApiParam(value = "业务类型", example = "0")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description")
     public Integer orderType;
 
     /**
@@ -50,7 +50,7 @@ public class WmsQCMaster extends BaseBean {
      */
     @Column(name = "ORDER_STATUS")
     @ApiParam(value = "状态", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     public Integer orderStatus;
 
     @Column(name = "REMARK")
@@ -87,11 +87,15 @@ public class WmsQCMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isTask;
 
-    @Column(name="IS_PART")
+    @Column(name = "IS_PART")
     @ApiParam(value = "是否散件", example = "2")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isPart;
+
+    public int getOrderStatusVal() {
+        return this.orderStatus == null ? 0 : this.orderStatus;
+    }
 }