冲突合并

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

@@ -2887,4 +2887,39 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * PDA顶级菜单
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PDA_TOP_MENU {
+        RC("RC", "收货"),
+        QC("QC", "质检"),
+        PICK("PICK", "拣货"),
+        OUTSTOCK("OUTSTOCK", "出库"),
+        INSTOCK("INSTOCK", "入库"),
+        MOVESTOCK("MOVESTOCK", "移库"),
+        ASSIST("ASSIST", "辅助"),
+        NC("NC", "NC"),
+        CS("CS", "盘点");
+        private String value;
+        private String description;
+
+        PDA_TOP_MENU(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
 }

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/WmsTransType.java

@@ -68,4 +68,8 @@ public class WmsTransType extends BaseBean {
     @Transient
     @ApiParam("菜单URL")
     private String menuUrl;
+
+    public String getMenuUrl() {
+        return "/handle?transCode=" + this.transTypeCode;
+    }
 }

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

@@ -118,7 +118,7 @@ public class WmsHqlPack {
         DdlPackBean packBean = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
@@ -1014,6 +1014,8 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsMoveSn.getItem(), "item", result);
+        DdlPreparedPack.getNumEqualPack(wmsMoveSn.getItemStatus(), "itemStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
@@ -2000,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);