bean修改 同步pdm

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

@@ -28,16 +28,16 @@ import javax.persistence.Table;
 @Api("工厂仓库信息")
 public class WareHouse extends BaseBean {
 
-    @Column(name="CODE")
+    @Column(name="WM_NO")
     @ApiParam("仓库代码")
-    public String code;
+    public String wmNo;
 
-    @Column(name="NAME")
+    @Column(name="WM_NAME")
     @ApiParam("仓库名称")
-    public String name;
+    public String wmName;
 
-    @Column(name="ADDRESS")
+    @Column(name="WM_ADDR")
     @ApiParam("仓库地址")
-    public String address;
+    public String wmAddr;
 
 }

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,6 +132,14 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam(value = "目的条码状态", example = "1")
     public Integer destSnStatus;
 
+    @Column(name="DATE_CODE")
+    @ApiParam("生产日期")
+    public String dateCode;
+
+    @Column(name="FIX_LOT_NO")
+    @ApiParam("特殊批次")
+    public String fixLotNo;
+
     public WmsMoveSn(){}
 
     public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){

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;
 }