冲突解决 合并代码

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

@@ -273,7 +273,7 @@ public class CommonEnumUtil {
 //        EXPIRE(5, "服务到期", "服务到期_EXPIRE"),
         LOCKING(3, "fa cell-fa fa-lock", "锁定"),
         ENABLE(1, "fa fa-success cell-fa fa-check", "启用"),
-        DISABLE(2, "fa fa-disabled cell-fa fa-times-circle", "禁止");
+        DISABLE(2, "fa fa-disabled cell-fa fa-times-circle", "禁用");
 
         private int value;
         private String code;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java

@@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.model.dynamic.table;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2018-12-11 15:37
+ * @Modify:
+ *  动态 Table 单元格
+ **/
+@Data
+public class DynTableCell {
+
+    // 排序
+    private Integer cellSeq;
+    // 单元格名称
+    private String cellName;
+    // 单元格名称英文
+    private String cellNameEn;
+    // 单元格数据
+    private Object cellValue;
+    // 单元格数据
+    private Integer cellValueType;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java

@@ -0,0 +1,82 @@
+package cn.estsh.i3plus.pojo.model.dynamic.table;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2018-12-11 16:43
+ * @Modify:
+ *      动态表单 工具类
+ **/
+public class DynTablePackTool {
+
+
+    /**
+     * 获取 Table 空行对象
+     * @return
+     */
+    public static DynTableRow getTableRow(){
+        return new DynTableRow();
+    }
+
+    /**
+     * 获取 Table 空行对象
+     * @return
+     */
+    public static DynTableRow getTableRow(String rowKey){
+        DynTableRow row = getTableRow();
+        row.setKey(rowKey);
+        return row;
+    }
+
+    public static DynTableRow getDynTableRow(ImppDynTable table, String key){
+        if(table != null && key != null){
+            return table.getTable().get(key);
+        }
+        return null;
+    }
+
+    /**
+     * 表单 中添加行数据
+     * @param table
+     * @param row
+     * @return
+     */
+    public static DynTableRow putDynTableRow(ImppDynTable table,DynTableRow row){
+        return table.getTable().put(row.getKey(),row);
+    }
+
+    /**
+     * 创建单元格
+     * @param seq
+     * @param name
+     * @param value
+     * @return
+     */
+    public static DynTableCell getTableCell(Integer seq,String name,Object value) {
+        return getTableCell(seq, name, null, value,null);
+    }
+
+    public static DynTableCell getTableCell(Integer seq,String name,Object value,Integer valueType) {
+        return getTableCell(seq, name, null, value,valueType);
+    }
+
+    /**
+     *  创建一个单元格
+     * @param seq       单元格排序
+     * @param name      单元格名称
+     * @param nameEn    单元格名称En
+     * @param value     单元格数据
+     * @return
+     */
+    public static DynTableCell getTableCell(Integer seq,String name,String nameEn,Object value,Integer valueType){
+        DynTableCell cell = new DynTableCell();
+        cell.setCellSeq(seq);
+        cell.setCellName(name);
+        cell.setCellNameEn(nameEn);
+        cell.setCellValue(value);
+        cell.setCellValueType(valueType);
+        return cell;
+    }
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.model.dynamic.table;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2018-12-11 15:37
+ * @Modify:
+ *      动态Table Row
+ **/
+@Data
+public class DynTableRow {
+
+    private String key;
+
+    // 行号
+    private Integer index = 0;
+
+    // 行Size
+    private Integer cellSize = 0;
+
+    // 行数据
+    private List<DynTableCell> cellList = new ArrayList<>();
+
+
+    public DynTableRow addList(DynTableCell cell){
+        this.cellList.add(cell);
+        return this;
+    }
+
+    public Integer getCellSize() {
+        return cellList != null ? cellList.size() : 0;
+    }
+
+    /**
+     * 禁止外部给 Size 赋值
+     * @param cellSize
+     */
+    private void setCellSize(Integer cellSize) { }
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/ImppDynTable.java

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.model.dynamic.table;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Adair Peng
+ * @CreateDate : 2018-12-11 15:37
+ * @Modify:
+ *      动态Table Row
+ **/
+@Data
+public class ImppDynTable {
+
+    // 行数据
+    private Map<String,DynTableRow> table = new HashMap<>();
+
+    // 表单标题
+    private String tableTitle;
+
+    public ImppDynTable() {
+    }
+
+    public ImppDynTable(String tableTitle) {
+        this.tableTitle = tableTitle;
+    }
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java

@@ -77,7 +77,7 @@ public class SysOrderNoRule extends BaseBean {
 
     public void setIsCycleName(String isCycleName) {
         this.isCycleName = isCycleName;
-        this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName);
+//        this.isCycle = CommonEnumUtil.TRUE_OR_FALSE.descOf(isCycleName);
     }
 
     @Column(name = "SERIAL_NO")

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

@@ -53,6 +53,20 @@ public class WmsActionResponseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     public Long alId;
 
+    /**
+     * 默认为False，如果这个值为True，
+     * 就把detailsData的内容以List的格式显示到 列表提示区域
+     */
+    @ApiParam(value = "是否需要选择单号")
+    public Boolean toSelected;
+
+    /**
+     * 与 toSelected 属性配合使用，
+     * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件
+     */
+    @ApiParam(value = "关键字段列名")
+    public String keyColumn;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;

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

@@ -1110,6 +1110,8 @@ public class WmsHqlPack {
 
         getStringBuilderPack(wmsActionGroupDetails, result);
 
+        HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result);
+
         return result.toString();
     }
 
@@ -1190,4 +1192,23 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * PO订单条码表 分页查询
+     *
+     * @param wmsPoSn
+     * @return
+     */
+    public static String packHqlWmsPoSn(WmsPoSn wmsPoSn) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsPoSn.getOrderNo(), "orderNo", result);
+        HqlPack.getStringLikerPack(wmsPoSn.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result);
+
+        getStringBuilderPack(wmsPoSn, result);
+
+        return result.toString();
+    }
 }