Merge branch 'test'

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java

@@ -112,8 +112,12 @@ public class DynamicEntity extends BaseBean implements Serializable {
         try {
             val = getValue(propName,val);
 //            LOGGER.error("设置动态对象属性值 attr name:{} -> value:{} ",setMethodName,val);
-            Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
-            setMethod.invoke(this, val);
+            if(val != null){
+                Method setMethod = this.getClass().getDeclaredMethod(setMethodName, new Class[]{val.getClass()});
+                setMethod.invoke(this, val);
+            }else{
+                LOGGER.error("设置动态对象属性值 attr name:{} -> value:{} ",setMethodName,val);
+            }
         } catch (NoSuchMethodException e) {
 //            LOGGER.error("没有方法：{}",setMethodName,e);
             LOGGER.error("没有方法：{}",setMethodName);

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

@@ -2855,6 +2855,40 @@ public class WmsEnumUtil {
     }
 
     /**
+     * ERP同步标识 10=待同步，20=同步成功，30=同步失败
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMS_SN_GENERATE_RULE {
+        SOURCE(10, "源"), TARGET(20, "目标"), NON_ASSIGNMENT(30, "不赋值");
+
+        private int value;
+        private String description;
+
+        WMS_SN_GENERATE_RULE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * PDA顶级菜单
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -96,20 +96,34 @@ public class CoreHqlPack {
      * @param position
      * @return
      */
-    public static String packHqlSysPosition(SysPosition position){
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlSysPosition(SysPosition position){
+        DdlPackBean result = new DdlPackBean();
+
 
         // 查询参数封装
-        HqlPack.getNumEqualPack(position.getParentId(),"parentId",result);
-        HqlPack.getStringLikerPack(position.getName(),"name",result);
-        HqlPack.getStringLikerPack(position.getPositionCode(),"positionCode",result);
+        DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result);
+        DdlPreparedPack.getStringEqualPack(position.getName(),"name",result);
+        DdlPreparedPack.getStringEqualPack(position.getPositionCode(),"positionCode",result);
+        DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result);
 
-        // 添加默认排序
-        HqlPack.getOrderDefault(position);
+        return result;
+    }
 
-        return result.toString();
+    /**
+     * 岗位复杂查询
+     * @param position
+     * @return
+     */
+    public static DdlPackBean packHqlSysPositionList(SysPosition position){
+        DdlPackBean result = new DdlPackBean();
+
+        // 查询参数封装
+        DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result);
+
+        return result;
     }
 
+
     /**
      * 组织复杂查询
      * @param organize

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

@@ -58,14 +58,26 @@ public class WmsCSOrderMaster extends BaseBean {
     @ApiParam(value = "是否允许清点", example = "1")
     public Integer isInventory;
 
-    @Transient
-    @ApiParam(value = "盘点明细集")
-    public List<WmsCSOrderDetails> wmsCSOrderDetailsList;
-
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
     public Integer isTask;
 
+    @Column(name = "IS_PART")
+    @ApiParam(value = "是否散件")
+    public Integer isPart;
+
+    @Column(name = "YEAR")
+    @ApiParam("年度")
+    public String year;
+
+    @Column(name = "IS_SYNC_ERP")
+    @ApiParam("是否同步ERP: 1=已同步，2=未同步")
+    public Integer isSyncErp;
+
+    @Transient
+    @ApiParam(value = "盘点明细集")
+    public List<WmsCSOrderDetails> wmsCSOrderDetailsList;
+
     @Transient
     @ApiParam(value = "盘点物料清单")
     public String[] wmsCSParts;
@@ -78,14 +90,6 @@ public class WmsCSOrderMaster extends BaseBean {
     @ApiParam(value = "盘点库位清单")
     public String[] wmsCSLocates;
 
-    @Column(name = "IS_PART")
-    @ApiParam(value = "是否散件")
-    private Integer isPart;
-
-    @Column(name = "YEAR")
-    @ApiParam("年度")
-    public String year;
-
     public Integer getIsInventoryVal() {
         return this.isInventory == null ? 0 :this.isInventory.intValue();
     }

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

@@ -210,4 +210,16 @@ public class WmsDocMovementDetails extends BaseBean {
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
     public transient Integer lockVersion;
+
+    @Transient
+    @ApiParam("移动类型")
+    public Integer moveType;
+
+    @Transient
+    @ApiParam("业务类型")
+    public Integer busiType;
+
+    @Column(name = "IS_SN")
+    @ApiParam(value = "条码生成状态", example = "1")
+    public Integer isSn;
 }

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

@@ -151,6 +151,10 @@ public class WmsPart extends BaseBean {
     @ApiParam("库存水平")
     private String stockLevelStatus;
 
+    @Column(name = "IS_PROD_LOT")
+    @ApiParam(value = "是否录入生产批次", example = "1")
+    private Integer isProdLot;
+
     public int getIqcValue(){
         return this.iqc == null ? 0 : this.iqc.intValue();
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateSnRule.java

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.wms.engine.rule;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GenerateSnRule {
+    /**
+     * 业务类型  130
+     */
+    private Integer busiType;
+
+    /**
+     * 是否允许生成条码
+     */
+    private Integer isGenerateSn;
+
+    /**
+     * 条码状态
+     */
+    private Integer snStatus;
+
+    /**
+     * 质量状态
+     */
+    private Integer qcStatus;
+
+    /**
+     * 仓库来源
+     */
+    private Integer whSource;
+
+    /**
+     * 存储区来源
+     */
+    private Integer zoneSource;
+}

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

@@ -2002,6 +2002,7 @@ public class WmsHqlPack {
     public static DdlPackBean packHqlWmsUnit(WmsUnit wmsUnit) {
         DdlPackBean result = new DdlPackBean();
 
+        DdlPreparedPack.getStringEqualPack(wmsUnit.getOrganizeCode(), "organizeCode", result);
         DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitCode(), "unitCode", result);
         DdlPreparedPack.getStringEqualPack(wmsUnit.getUnitName(), "unitName", result);
         DdlPreparedPack.getNumEqualPack(wmsUnit.getUnitPrecision(), "unitPrecision", result);