diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 791465e..b1ff4f5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -85,4 +85,20 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam(value = "发货日期") private String sendDate; + + @Transient + @ApiParam(value = "工厂名称") + public String organizeName; + + @Transient + @ApiParam("联系人") + private String vendorOwner; + + @Transient + @ApiParam("邮箱") + private String vendorEmail; + + @Transient + @ApiParam("供应商名称") + private String vendorName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index de27d02..913e031 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -122,5 +122,21 @@ public class WmsASNMasterDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public int lockVersion; + public transient int lockVersion; + + @Transient + @ApiParam("实收数量") + private Double rcQty; + + @Transient + @ApiParam("ASN条码总箱数") + public Integer totalBoxes; + + @Transient + @ApiParam("差异") + public Double difference; + + @Transient + @ApiParam("标准包装") + public Double snp; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 45df2ab..3695b07 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -197,5 +197,5 @@ public class WmsDocMovementDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public int lockVersion; + public transient int lockVersion; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index e2f4114..c400de9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -107,4 +107,16 @@ public class WmsPOMaster extends BaseBean { @Column(name = "IS_SN") @ApiParam(value = "是否生成条码", example = "1") public Integer isSn; + + @Transient + @ApiParam(value = "工厂名称") + public String organizeName; + + @Transient + @ApiParam("联系人") + private String vendorOwner; + + @Transient + @ApiParam("邮箱") + private String vendorEmail; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index b2409cd..bb875c1 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -141,5 +141,14 @@ public class WmsPOMasterDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public int lockVersion; + public transient int lockVersion; + + @Transient + @ApiParam("PO条码总箱数") + public Integer totalBoxes; + + @Transient + @ApiParam("差异") + public Double difference; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 4930cd7..f7ed231 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -84,5 +84,5 @@ public class WmsQCDetails extends BaseBean { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public int lockVersion; + public transient int lockVersion; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index c08f196..cba3169 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1394,8 +1394,9 @@ public class WmsHqlPack { * @param groupDataAuth * @return */ - public static DdlPackBean packHqlWmsTaskDetail(Map> groupDataAuth, String refSrc) { + public static DdlPackBean packHqlWmsTaskDetail(Map> groupDataAuth, String refSrc, String organizeCode) { DdlPackBean result = new DdlPackBean(); + int i = 1; Set>> entries = groupDataAuth.entrySet(); //拼sql entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())); @@ -1430,8 +1431,14 @@ public class WmsHqlPack { } } } + + String hqlString = " and ( 1=1 " + result.getPackedHql() + ") "; + + result.setWhereAppend(hqlString); // 通用数据拼接 - getStringBuilderPack(new WmsDataAuth(), result); + WmsDataAuth wmsDataAuth = new WmsDataAuth(); + wmsDataAuth.setOrganizeCode(organizeCode); + getStringBuilderPack(wmsDataAuth, result); return result; }