枚举字段新增AMP

ASN主表、生产报工明细表新增属性
hql查询ASN主表信息

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -94,7 +94,8 @@ public class WmsEnumUtil {
         REG(10, "REG", "原物料采购"),
         SUB(20, "SUB", "委外采购"),
         TAR(30, "TAR", "多角贸易采购"),
-        TAP(40, "TAP", "多角代采购");
+        TAP(40, "TAP", "多角代采购"),
+        AMP(50, "AMP", "AMP拉动");
 
         private int value;
         private String code;

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

@@ -101,4 +101,12 @@ public class WmsASNMaster extends BaseBean {
     @Transient
     @ApiParam("供应商名称")
     private String vendorName;
+
+    @Column(name = "ACTION_STATUS")
+    @ApiParam(value = "处理状态", example = "10")
+    public Integer actionStatus;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    public String remark;
 }

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

@@ -42,7 +42,7 @@ public class WmsDocFgDetail extends BaseBean {
     public String lineNo;
 
     @Column(name="COMMIT_TIME")
-    @ApiParam("提交日期")
+    @ApiParam("提交时间")
     public String commitTime;
 
     @Column(name="MFG_LOG_NO")
@@ -127,4 +127,8 @@ public class WmsDocFgDetail extends BaseBean {
     @Column(name="REMARK")
     @ApiParam("备注")
     public String remark;
+
+    @Column(name="COMMIT_DATE")
+    @ApiParam("提交日期")
+    public String commitDate;
 }

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

@@ -2067,4 +2067,25 @@ public class WmsHqlPack {
 
         return result;
     }
+
+    /**
+     * 根据id集合查询生产报工明细表的数据
+     *
+     * @param statusList
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean packHqlWmsASNMasterByStatus(List<Integer> statusList,String organizeCode) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getInPackList(statusList,"asnStatus",result);
+        DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result);
+        DdlPreparedPack.getStringEqualPack(String.valueOf(WmsEnumUtil.ORDER_TYPE.AMP.getValue()),"asnType",result);
+        DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
+        return result;
+    }
 }