产品入库模块和作业任务模块

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

@@ -57,16 +57,19 @@ public class WmsFGInStock extends BaseBean {
     public String sn;
 
     /**
-     * 状态:0=新建,10=已处理,20=处理出错
+     * 状态：1=新建,10=已处理,20=处理出错
      */
-    @Column(name="STATUS")
-    @ApiParam(value = "状态", example = "0")
-    public Integer status;
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer orderStatus;
 
     @Column(name="REMARK")
     @ApiParam("备注")
     public String reMark;
 
+    /**
+     * 来源：MNU=手工,MES=MES接口
+     */
     @Column(name="SRC")
     @ApiParam("单据来源")
     public String src;
@@ -91,7 +94,7 @@ public class WmsFGInStock extends BaseBean {
     @ApiParam("特殊发货标志")
     public String shippingFlag;
 
-    @Column(name="LOT_NO")
+    @Column(name="MFG_LOG_NO")
     @ApiParam("生产批次")
-    public String lotNo;
+    public String mfgLogNo;
 }

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

@@ -45,9 +45,9 @@ public class WmsTaskInfo extends BaseBean {
     public String reMark;
 
     /**
-     * 状态:0=创建,5=待处理,10=已处理
+     * 状态:1=创建,10=待处理,20=已处理
      */
-    @Column(name="STATUS")
-    @ApiParam(value = "状态", example = "0")
-    public Integer status;
+    @Column(name="TASK_STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer taskStatus;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskInfoRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTaskInfo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(作业任务信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-13 15:53
+ * @Modify:
+ **/
+@Repository
+public interface WmsTaskInfoRepository extends BaseRepository<WmsTaskInfo, Long> {
+}

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

@@ -577,4 +577,49 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(WmsEnumUtil.IS_DELETED.INDELETED.getValue(),"isDeleted",result);
         return result.toString();
     }
+
+    /**
+     * 产品入库信息 条件封装
+     * @param wmsFGInStock
+     * @return
+     */
+    public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock){
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsFGInStock.getOrderNo(),"orderNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getWoNo(),"woNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getPartNo(),"partNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(),"partNameRdd",result);
+        HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(),"qty",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getUnit(),"unit",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getSn(),"sn",result);
+        HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(),"orderStatus",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getReMark(),"reMark",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getSrc(),"src",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getErpWhNo(),"erpWhno",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getLineNo(),"lineNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getWhNo(),"whNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(),"custNo",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(),"shippingFlag",result);
+        HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(),"mfgLogNo",result);
+        HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(),"isValid",result);
+        HqlPack.getNumEqualPack(wmsFGInStock.getIsDeleted(),"isDeleted",result);
+        return result.toString();
+    }
+
+    /**
+     * 作业任务信息条件封装
+     * @param wmsTaskInfo
+     * @return
+     */
+    public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo){
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(),"moveNo",result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(),"userNo",result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(),"opTypeCode",result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(),"reMark",result);
+        HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(),"taskStatus",result);
+        HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(),"isValid",result);
+        HqlPack.getNumEqualPack(wmsTaskInfo.getIsDeleted(),"isDeleted",result);
+        return result.toString();
+    }
 }