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

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

@@ -119,6 +119,19 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam(value = "物料数量", example = "1")
     public Double sumPartQty;
 
+    /**
+     * 条码状态:1=创建,10=已收货,20=已质检,
+     * 30=已入库,40=待出库,50=已出库,
+     * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
+     */
+    @Transient
+    @ApiParam(value = "条码状态", example = "1")
+    public Integer snStatus;
+
+    @Transient
+    @ApiParam(value = "条码状态(冻结时)", example = "1")
+    public Integer destSnStatus;
+
     @Transient
     @ApiParam("存储区编号组")
     public String[] zoneNos;

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

@@ -93,6 +93,11 @@ public class WmsCSOrderDetails extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
     public Integer snStatus;
 
+    @Column(name = "DEST_SN_STATUS")
+    @ApiParam(value = "条码状态(冻结时)", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description")
+    public Integer destSnStatus;
+
     /**
      * 处理状态:10=已创建,20=已盘,30=已冻结,40=已解冻,50=取消冻结
      */

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

@@ -53,8 +53,6 @@ public class WmsRouting extends BaseBean {
 
     @Column(name = "FOR_PRODUCT")
     @ApiParam(value = "适用产品")
-    
-     
     private Integer forProduct;
 
 	@Transient