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/WmsDocMovementSn.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 移库单条码表
@@ -66,4 +67,8 @@ public class WmsDocMovementSn extends BaseBean {
     @Column(name="SN")
     @ApiParam("条码")
     public String sn;
+
+    @Transient
+    @ApiParam("前端表格编辑使用")
+    private Boolean isSet = false;
 }

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

@@ -122,6 +122,13 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam(value = "供应商批次")
     public String dateCode;
 
+    @Transient
+    @ApiParam("前端表格编辑使用")
+    public Boolean isSet = false;
+
+    @Transient
+    @ApiParam("供应商批次字段是否可编辑")
+    public Boolean isDateCodeEdit = true;
 
     public Double getInputRcQty(){ return this.inputRcQty == null ? 0 : this.inputRcQty; }
 }

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

@@ -170,6 +170,10 @@ public class WmsStockSn extends BaseBean {
     @Transient
     public Double inputNCQty;
 
+    @ApiParam(value = "前端散件表格是否编辑")
+    @Transient
+    public Boolean isSet = false;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){

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

@@ -163,7 +163,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "",
                 WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""),"poStatus",result);
-        HqlPack.getNumEqualPack(wmsPOMaster.getIsPart(),"isPart", result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
         HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
@@ -1033,7 +1033,7 @@ public class WmsHqlPack {
         //查询参数封装
         HqlPack.getInPack(String.join(",", WmsEnumUtil.QC_INFO_STATUS.CREATE.getValue() + "",
                 WmsEnumUtil.QC_INFO_STATUS.FINISH.getValue() + ""),"orderStatus",result);
-        HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result);
+        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isPart",result);
         //单号
         HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result);
         getStringBuilderPack(wmsQCMaster, result);