Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMethod.java

@@ -49,6 +49,10 @@ public class BfMethod extends BaseBean {
     @ApiParam(value ="功能描述")
     private String methodDescription;
 
+    @Column(name="IS_DESIGN")
+    @ApiParam(value ="是否进行功能设计")
+    private Integer isDesign;
+
     @Transient
     @ApiParam(value ="表单功能自定义按钮")
     private List<BfButton> bfButtonList;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -754,4 +754,53 @@ public class MesHqlPack {
 
         return packBean;
     }
+
+    /**
+     * MES工作单元参数配置查询条件封装
+     * @param workCellParamCfg
+     * @return
+     */
+    public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode);
+        if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())){
+            DdlPreparedPack.getStringEqualPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())){
+            DdlPreparedPack.getStringEqualPack(workCellParamCfg.getParamCode(), "paramCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES工作单元队列查询条件封装
+     * @param workCellPoint
+     * @return
+     */
+    public static DdlPackBean getMesWorkCellPoint(MesWorkCellPoint workCellPoint, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(workCellPoint, organizeCode);
+        if (StringUtils.isNotEmpty(workCellPoint.getWorkCellCode())){
+            DdlPreparedPack.getStringEqualPack(workCellPoint.getWorkCellCode(), "workCellCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * PLC设备信息配置查询条件封装
+     * @param plcConfigure
+     * @return
+     */
+    public static DdlPackBean getMesPLCConfigure(MesPLCConfigure plcConfigure, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(plcConfigure, organizeCode);
+        if (StringUtils.isNotEmpty(plcConfigure.getAreaCode())){
+            DdlPreparedPack.getStringEqualPack(plcConfigure.getAreaCode(), "areaCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(plcConfigure.getWorkCenterCode())){
+            DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(plcConfigure.getWorkCellCode())){
+            DdlPreparedPack.getStringEqualPack(plcConfigure.getWorkCellCode(), "workCellCode", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * @Description : PO条码表
@@ -90,4 +87,32 @@ public class WmsPoSn extends BaseBean {
     @ColumnDefault("0")
     @ApiParam(value = "收货数量", example = "0")
     public Double recQty;
+
+    @ApiParam(value = "供应商名称")
+    @Transient
+    public String vendorNameRdd;
+
+    @ApiParam(value = "项目名称")
+    @Transient
+    public String prodCfgTypeName;
+
+    @ApiParam(value = "标签编号")
+    @Transient
+    public String labelNo;
+
+    @ApiParam(value = "送货批号")
+    @Transient
+    public String lotNo;
+
+    @Transient
+    @ApiParam(value = "生产日期")
+    public String dateCode;
+
+    @Transient
+    @ApiParam(value = "订单号")
+    public String refSrc;
+
+    @Transient
+    @ApiParam(value = "条码")
+    public String sn;
 }

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

@@ -188,6 +188,14 @@ public class WmsStockSn extends BaseBean {
     @Transient
     public Boolean isAdd;
 
+    @ApiParam(value = "项目名称")
+    @Transient
+    public String prodCfgTypeName;
+
+    @ApiParam(value = "标签编号")
+    @Transient
+    public String labelNo;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){