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

modules/i3plus-pojo-model/pom.xml

@@ -29,6 +29,11 @@
             <artifactId>i3plus-pojo-report</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-wms</artifactId>
+        </dependency>
+
     </dependencies>
 
 

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

@@ -1,28 +0,0 @@
-package cn.estsh.i3plus.pojo.model.wms;
-
-import lombok.Data;
-
-/**
- * @Description : 流程管家模型
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2018-11-28 15:50
- * @Modify:
- **/
-@Data
-public class ActionButlerModel {
-
-    private String orderNo;
-
-    private String sn;
-
-    private String aLId;
-
-    private String userNo;
-
-    private String fixNo;
-
-    private String barCode;
-
-    private String funCallName;
-}

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

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 库存移动明细模型
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2019-03-06 15:50
+ * @Modify:
+ **/
+@Data
+public class WmsMoveDetailsModel {
+    public String orderNo;
+
+    public Integer item;
+
+    public String partNo;
+
+    public String partNameRdd;
+
+    public String vendorNo;
+
+    public String custNo;
+
+    public Double qty;
+
+    public Double transQty;
+
+    public String unit;
+
+    public String srcWhNo;
+
+    public String srcZoneNo;
+
+    public String srcLocateNo;
+
+    public String destWhNo;
+
+    public String destZoneNo;
+
+    public String destLocateNo;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    public Integer itemStatus;
+
+    /**
+     * ASN,PO,SO
+     */
+    public Integer refType;
+
+    public String refSrc;
+
+    private List<WmsMoveSnModel> moveDetails;
+}

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

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 库存移动单模型
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2019-03-06 15:50
+ * @Modify:
+ **/
+@Data
+public class WmsMoveMasterModel {
+    public String orderNo;
+
+    public Integer orderStatus;
+
+    public String reMark;
+
+    private String transTypeCode;
+
+    private List<WmsMoveDetailsModel> moveDetails;
+}

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

@@ -0,0 +1,42 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import lombok.Data;
+
+/**
+ * @Description : 库存移动条码模型
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2019-03-06 15:50
+ * @Modify:
+ **/
+@Data
+public class WmsMoveSnModel {
+    public String orderNo;
+
+    public Integer item;
+
+    public String partNo;
+
+    public String partNameRdd;
+
+    public String unit;
+
+    public String sn;
+
+    /**
+     * 状态:1=创建,10=待处理,20=已处理
+     */
+    public Integer itemStatus;
+
+    public String reMark;
+
+    public String lotNo;
+
+    public String packAgeNo;
+
+    public Double qty;
+
+    public String srcLocateNo;
+
+    public String destLocateNo;
+}

modules/i3plus-pojo-wms/pom.xml

@@ -16,11 +16,6 @@
     <dependencies>
         <dependency>
             <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-model</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
     </dependencies>

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

@@ -1,7 +1,5 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
-import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
-import cn.estsh.i3plus.pojo.model.wms.OptionModel;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -45,7 +43,7 @@ public class WmsActionResponseBean<Obj> {
     public List<String> informations;
 
     @ApiParam("可选项")
-    public List<OptionModel> options;
+    public List<WmsOptionModel> options;
 
     @ApiParam("选中的明细数据")
     public Obj details;

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

@@ -1,13 +1,11 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.model.wms.OptionModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description : PDA传输到后台的实体bean对象

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

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.model.wms;
+package cn.estsh.i3plus.pojo.wms.bean;
 
 import lombok.Data;
 
@@ -10,7 +10,7 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-public class OptionModel {
+public class WmsOptionModel {
 
     private String code;
 

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

@@ -106,4 +106,8 @@ public class WmsPart extends BaseBean {
     @Column(name="LOT_CHECK_RULE")
     @ApiParam(value ="批次校验规则")
     private String lotCheckRule;
+
+    @Column(name="IN_LOCATE_NO")
+    @ApiParam(value ="默认入库库位")
+    private String inLocateNo;
 }

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

@@ -56,8 +56,31 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "可用数量", example = "0")
     public Double qty;
 
-    @Column(name = "TOTAL_QTY")
-    @ApiParam(value = "总数量", example = "0")
-    private Double totalQty;
+    @Column(name = "FAIL_QTY")
+    @ApiParam(value = "不合格数量", example = "0")
+    private Double failQty;
 
+    @Column(name = "HOLD_QTY")
+    @ApiParam(value = "隔离数量", example = "0")
+    private Double holdQty;
+
+    @Column(name = "QC_QTY")
+    @ApiParam(value = "质检中数量", example = "0")
+    private Double qcQty;
+
+    @Column(name = "RIN_QTY")
+    @ApiParam(value = "待入库数量", example = "0")
+    private Double rinQty;
+
+    @Column(name = "FREEZE_QTY")
+    @ApiParam(value = "冻结数量", example = "0")
+    private Double freezeQty;
+
+    @Column(name = "CONSIGN_QTY")
+    @ApiParam(value = "寄售数量", example = "0")
+    private Double consignQty;
+
+    @Column(name = "LOCK_QTY")
+    @ApiParam(value = "锁定数量", example = "0")
+    private Double lockQty;
 }

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

@@ -1237,4 +1237,32 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     *  根据条件查询库存条码信息
+     * @param wmsStockSn
+     * @return
+     */
+    public static String packHqlWmsStockSn(WmsStockSn wmsStockSn) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(wmsStockSn.getSn(),"sn", result);
+        HqlPack.getStringEqualPack(wmsStockSn.getLocateNo(),"locateNo", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getSnStatus(),"snStatus", result);
+        HqlPack.getNumEqualPack(wmsStockSn.getQcStatus(),"qcStatus", result);
+        getStringBuilderPack(wmsStockSn, result);
+        return result.toString();
+    }
+
+    /**
+     *  根据条件查询库存信息
+     * @param wmsStockQuan
+     * @return
+     */
+    public static String packHqlWmsStockQuan(WmsStockQuan wmsStockQuan) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(),"partNo", result);
+        HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(),"locateNo", result);
+        getStringBuilderPack(wmsStockQuan, result);
+        return result.toString();
+    }
 }