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

# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java

@@ -165,4 +165,20 @@ public class ReportHqlPack {
 
         return result.toString();
     }
+
+    /**
+     * 元素名称是否存在
+     * @param brElement
+     * @return
+     */
+    public static String packHqlBrElementName(BrElement brElement){
+        StringBuffer result =  new StringBuffer();
+
+        // and
+        HqlPack.getStringEqualPack(brElement.getElementName(),"elementName",result);
+        // not
+        HqlPack.getNumNOEqualPack(brElement.getId(),"id",result);
+
+        return result.toString();
+    }
 }

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

@@ -43,4 +43,8 @@ public class WmsActionModule extends BaseBean {
     @Column(name="AM_TYPE")
     @ApiParam(value = "组件类型", example = "0")
     public Integer amType;
+
+    @Column(name="OP_TYPE_CODE")
+    @ApiParam(value = "作业类型", example = "0")
+    public Integer opTypeCode;
 }

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

@@ -63,7 +63,7 @@ public class WmsCheckFactRecord extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name="PLAN_QTY")
     @ApiParam(value = "应收数量", example = "0")

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

@@ -62,7 +62,7 @@ public class WmsMoveSn extends BaseBean {
 
     @Column(name="REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name="LOT_NO")
     @ApiParam("批次编号")
@@ -132,13 +132,13 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam(value = "目的条码状态", example = "1")
     public Integer destSnStatus;
 
-    @Column(name = "DATE_CODE")
+    @Column(name="DATE_CODE")
-    @ApiParam(value = "生产日期")
+    @ApiParam("生产日期")
     public String dateCode;
 
-    @Column(name = "FIX_LOT_NO")
+    @Column(name="FIX_LOT_NO")
-    @ApiParam(value = "特殊批次")
+    @ApiParam("特殊批次")
-    private String fixLotNo;
+    public String fixLotNo;
 
     public WmsMoveSn(){}
 

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

@@ -61,7 +61,7 @@ public class WmsQCDetails extends BaseBean {
 
     @Column(name = "REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
 
     @Column(name = "FACT_QTY")

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

@@ -50,7 +50,7 @@ public class WmsQCMaster extends BaseBean {
 
     @Column(name = "REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     @Column(name = "CUSTOMER_NO")
     @ApiParam("客户编号")

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

@@ -52,6 +52,10 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam("单位")
     public String unit;
 
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编码")
+    private String custNo;
+
     @Column(name = "QTY")
     @ApiParam(value = "可用数量", example = "0")
     public Double qty;

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

@@ -46,7 +46,7 @@ public class WmsTaskInfo extends BaseBean {
 
     @Column(name = "REMARK")
     @ApiParam("备注")
-    public String reMark;
+    public String remark;
 
     /**
      * 状态:1=创建,10=待处理,20=已处理

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

@@ -45,11 +45,11 @@ public class WmsTransQuan extends BaseBean {
     private String locateNo;
 
     @Column(name = "PART_NO")
-    @ApiParam(value = "零件编号")
+    @ApiParam(value = "物料编码")
     private String partNo;
 
     @Column(name = "PART_NAME_RDD")
-    @ApiParam(value = "零件名称")
+    @ApiParam(value = "物料名称")
     private String partNameRdd;
 
     @Column(name = "UNIT")
@@ -95,4 +95,8 @@ public class WmsTransQuan extends BaseBean {
     @Column(name = "CUST_NO")
     @ApiParam(value = "客户编号")
     private String custNo;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam(value = "错误信息")
+    private String errorMessage;
 }

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

@@ -645,7 +645,7 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
-        HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result);
         HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);
 
         getStringBuilderPack(wmsTaskInfo, result);