库位的零件数量为Double类型

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java

@@ -1,5 +1,8 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster;
+import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -13,33 +16,28 @@ import lombok.Data;
 @Data
 public class PrintOrderDataModel {
 
-    @ApiParam(value = "工厂代码")
-    public String organizeCode;
+    @ApiParam("业务数据类型")
+    public Integer busiDataType;
 
-    @ApiParam(value = "单号")
+    @ApiParam("单号")
     public String orderNo;
 
-    @ApiParam(value = "业务类型", example = "-1")
-    public Integer busiType;
-
-    @ApiParam(value = "状态", example = "-1")
-    public Integer status;
-
-    @ApiParam(value = "打印标志", example = "-1")
-    public Integer printFlag;
-
-    @ApiParam(value = "供应商编号")
-    public String vendorNo;
+    @ApiParam("工厂代码")
+    public String organizeCode;
 
-    @ApiParam(value = "客户编号")
-    public String custNo;
+    @ApiParam(value = "PO主表")
+    public WmsPOMaster poMaster;
 
-    @ApiParam(value = "版本")
-    public String version;
+    @ApiParam(value = "ASN主表")
+    public WmsASNMaster asnMaster;
 
-    @ApiParam(value = "ERP单号")
-    public String erpSrcNo;
+    @ApiParam(value = "移库单主表")
+    public WmsDocMovementMaster movementMaster;
 
-    @ApiParam(value = "业务数据类型", example = "-1")
-    public Integer busiDataType;
+    public int getBusiDataType() {
+        if (busiDataType != null) {
+            return busiDataType.intValue();
+        }
+        return 0;
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java

@@ -75,6 +75,10 @@ public class SysTaskPlan extends BaseBean {
     @ApiParam(value ="任务所属模块")
     private Integer taskSoftTypeRdd;
 
+    @Column(name="TASK_PLAN_PARAM")
+    @ApiParam(value ="任务计划参数")
+    private String taskPlanParam;
+
     @Column(name="TASK_CYCLE_START_DATE_TIME_RDD")
     @ApiParam(value ="任务开始时间")
     private String taskCycleStartDateTimeRdd;

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

@@ -66,4 +66,7 @@ public class WmsASNMaster extends BaseBean {
     @ApiParam(value = "是否生产任务", example = "1")
     public Integer isTask;
 
+    @ApiParam("ASN详情列表")
+    @Transient
+    public List<WmsASNMasterDetails> asnMasterDetailsList;
 }

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

@@ -77,6 +77,12 @@ public class WmsActionResponseBean<Obj> {
     /**
      * 默认为true，如果这个值为true就禁用按钮否则可用，
      */
+    @ApiParam(value = "按钮是否禁用")
+    public Boolean isCommitBtnDisabled = true;
+
+    /**
+     * 默认为true，如果这个值为true就禁用按钮否则可用，
+     */
     @ApiParam(value = "输入框是否禁用")
     public Boolean isInputBtnDisabled = false;
 

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

@@ -93,4 +93,8 @@ public class WmsCSOrderDetails extends BaseBean {
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "处理状态", example = "1")
     public Integer transStatus;
+
+    public Double getQty() {
+        return this.qty == null ? 0 : this.qty;
+    }
 }

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

@@ -108,4 +108,8 @@ public class WmsDocMovementMaster extends BaseBean {
     @Transient
     @ApiParam(value = "目的库存地代码")
     private String desrAreaNo;
+
+    @Column(name = "IS_PART")
+    @ApiParam(value = "是否散件")
+    private Integer isPart;
 }

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

@@ -94,4 +94,21 @@ public class WmsLocate extends BaseBean {
     @Column(name="PART_QTY")
     @ApiParam(value ="零件数", example = "-1")
     private Double partQty;
+
+    public Integer getMaxPackageQty() {
+        return this.maxPackageQty == null ? 0 : this.maxPackageQty;
+    }
+
+    public Integer getMaxPartQty() {
+        return this.maxPartQty == null ? 0 : this.maxPartQty;
+    }
+
+    public Integer getBoxQty() {
+        return this.boxQty == null ? 0 : this.boxQty;
+    }
+
+    public Double getPartQty() {
+        return this.partQty == null ? 0 : this.partQty;
+    }
+
 }

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

@@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : PO订单主表
@@ -78,4 +79,12 @@ public class WmsPOMaster extends BaseBean {
     @Column(name="IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
     public Integer isTask;
+
+    @Column(name="IS_PART")
+    @ApiParam(value = "是否散件", example = "1")
+    public Integer isPart;
+
+    @ApiParam("PO明细列表信息")
+    @Transient
+    public List<WmsPOMasterDetails> poDetailList;
 }

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

@@ -87,4 +87,8 @@ public class WmsQCMaster extends BaseBean {
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
     public Integer isTask;
+
+    @Column(name="IS_PART")
+    @ApiParam(value = "是否散件", example = "2")
+    public Integer isPart;
 }

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

@@ -96,4 +96,36 @@ public class WmsStockQuan extends BaseBean {
     @ColumnDefault("0")
     @ApiParam(value = "锁定数量", example = "0")
     private Double lockQty;
+
+    public Double getQty() {
+        return this.qty == null ? 0 : this.qty;
+    }
+
+    public Double getFailQty() {
+        return this.failQty == null ? 0 : this.failQty;
+    }
+
+    public Double getHoldQty() {
+        return this.holdQty == null ? 0 : this.holdQty;
+    }
+
+    public Double getQcQty() {
+        return this.qcQty == null ? 0 : this.qcQty;
+    }
+
+    public Double getRinQty() {
+        return this.rinQty == null ? 0 : this.rinQty;
+    }
+
+    public Double getFreezeQty() {
+        return this.freezeQty == null ? 0 : this.freezeQty;
+    }
+
+    public Double getConsignQty() {
+        return this.consignQty == null ? 0 : this.consignQty;
+    }
+
+    public Double getLockQty() {
+        return this.lockQty == null ? 0 : this.lockQty;
+    }
 }

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

@@ -149,4 +149,20 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "库位名称")
     @Transient
     public String locateNameRdd;
+
+    @ApiParam(value = "物料类型描述")
+    @Transient
+    public String partTypeDesc;
+
+    @ApiParam(value = "客户名称")
+    @Transient
+    public String custNameRdd;
+
+    @ApiParam(value = "供应商名称")
+    @Transient
+    public String vendorNameRdd;
+
+    @ApiParam(value = "二维码内容")
+    @Transient
+    public String barCode;
 }

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

@@ -120,4 +120,12 @@ public class WmsTaskDetails extends BaseBean {
     @Column(name = "DEST_AREA_NO")
     @ApiParam("目的库存地代码")
     public String destAreaNo;
+
+    public Double getQty() {
+        return this.qty == null ? 0 : this.qty;
+    }
+
+    public Double getTransQty() {
+        return this.transQty == null ? 0 : this.transQty;
+    }
 }

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 作业任务表信息
@@ -67,4 +68,8 @@ public class WmsTaskInfo extends BaseBean {
     @ApiParam("是否一步法操作")
     public Integer isOneStep;
 
+    @ApiParam("作业类型名称")
+    @Transient
+    public String opTypeName;
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -119,7 +119,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result);
+        HqlPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result);
         HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result);
         HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", result);
@@ -139,11 +139,11 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result);
-        HqlPack.getStringLikerPack(wmsPOMaster.getPoType(), "poType", result);
+        HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
         HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result);
-        HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
-        HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result);
+        HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
+        HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
 
         getStringBuilderPack(wmsPOMaster, result);
@@ -531,7 +531,7 @@ public class WmsHqlPack {
     public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) {
         StringBuffer result = new StringBuffer();
 
-        HqlPack.getStringEqualPack(wmsASNMaster.getOrderNo(), "orderNo", result);
+        HqlPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
         HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
@@ -1559,4 +1559,20 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 移库单订单条码表 分页查询
+     *
+     * @param details
+     * @return
+     */
+    public static String packHqlWmsDocMovementDetails(WmsDocMovementDetails details) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(details.getPartNo(), "partNo", result);
+
+        getStringBuilderPack(details, result);
+
+        return result.toString();
+    }
 }