天津麦格纳看板BUG修复

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -380,6 +381,10 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "最早需求时间")
     private String firstTime;
 
+    @Transient
+    @ApiParam(value = "处理中/创建中订单总数量")
+    private Long handleItemCount;
+
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
     }
@@ -412,6 +417,13 @@ public class WmsDocMovementDetails extends BaseBean {
         return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue();
     }
 
+    public String getLine() {
+        if (StringUtil.isEmpty(this.line)) {
+            return "";
+        }
+        return this.line;
+    }
+
     @Version
     @Column(name = "LOCK_VERSION", columnDefinition = "int default 0")
     @ApiParam(value = "乐观锁", example = "1")
@@ -470,16 +482,27 @@ public class WmsDocMovementDetails extends BaseBean {
     }
 
 
-    public WmsDocMovementDetails (String createDatetime, String srcZoneNo,String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) {
-        System.out.println("=======参数方法");
+    public WmsDocMovementDetails (String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, String partNo) {
         this.createDatetime = createDatetime;
         this.srcLocateNo = srcLocateNo;
         this.destLocateNo = destLocateNo;
         this.createUser = createUser;
         this.itemStatus= itemStatus;
         this.orderNo = orderNo;
+        this.srcZoneNo = srcZoneNo;
         this.partNo=partNo;
+    }
+
+
+    public WmsDocMovementDetails(String createDatetime, String srcZoneNo, String srcLocateNo, String destLocateNo, String createUser, Integer itemStatus, String orderNo, Long handleItemCount) {
+        this.createDatetime = createDatetime;
         this.srcZoneNo = srcZoneNo;
+        this.srcLocateNo = srcLocateNo;
+        this.destLocateNo = destLocateNo;
+        this.createUser = createUser;
+        this.itemStatus = itemStatus;
+        this.orderNo = orderNo;
+        this.handleItemCount = handleItemCount;
     }
 
     public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) {