diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index bf6d6ea..afc39d4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1987,4 +1987,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 单据是否散件 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_PART { + IS_ADJUST(1, "散件"), ADJUST(2, "非散件"); + + private int value; + private String description; + + IS_PART(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java index 315d8e3..c5e200c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfCascadeDetail.java @@ -33,13 +33,17 @@ public class BfCascadeDetail extends BaseBean { @Column(name = "CASCADE_ID") @ApiParam(value = "级联ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long cascade_id; + private Long cascadeId; @Column(name = "ELEMENT_ID") @ApiParam(value = "对象元素ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) private Long elementId; + @Column(name = "DETAIL_LABEL_TEXT") + @ApiParam(value = "提示信息") + private String detailLabelText; + @Column(name="ELEMENT_NAME") @ApiParam(value ="元素名称") private String elementName; @@ -51,7 +55,7 @@ public class BfCascadeDetail extends BaseBean { @Column(name = "PARENT_ID") @ApiParam(value = "父级ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) - private Long parent_id; + private Long parentId; @Column(name = "ELEMENT_PROPERTY_VALUE_ID") @ApiParam(value = "对象属性-元素属性ID", example = "-1") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java index 69d0ca8..a979a2c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementGrid.java @@ -46,7 +46,7 @@ public class BfElementGrid extends BaseBean { @Column(name = "IS_OBJECT_EDIT") @ApiParam(value = "是否编辑") - private Integer isObject_edit; + private Integer isObjectEdit; @Column(name = "IS_OBJECT_DEL") @ApiParam(value = "是否删除") diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java index d41e560..929fe5c 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfRefMethodRole.java @@ -9,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -26,26 +25,26 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="BF_REF_METHOD_ROLE") -@Api(value="功能角色关系",description = "功能角色关系") +@Table(name = "BF_REF_METHOD_ROLE") +@Api(value = "功能角色关系", description = "功能角色关系") public class BfRefMethodRole extends BaseBean { - @Column(name="METHOD_ID") - @ApiParam(value ="表单功能id") + @Column(name = "METHOD_ID") + @ApiParam(value = "表单功能id") @JsonSerialize(using = ToStringSerializer.class) private Long methodId; - @Column(name="METHOD_NAME_RDD") - @ApiParam(value ="表单功能名称") + @Column(name = "METHOD_NAME_RDD") + @ApiParam(value = "表单功能名称") private String methodNameRdd; - @Column(name="ROLE_ID") - @ApiParam(value ="角色id") + @Column(name = "ROLE_ID") + @ApiParam(value = "角色id") @JsonSerialize(using = ToStringSerializer.class) private Long roleId; - @Column(name="ROLE_NAME_RDD") - @ApiParam(value ="角色名称") + @Column(name = "ROLE_NAME_RDD") + @ApiParam(value = "角色名称") private String roleNameRdd; } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index 6fdcbef..428758e 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -45,6 +45,35 @@ public final class FormHqlPack { } /** + * In 参数封装 + * @param columnName 列名 + * @param params 参数 + * @param isDeleted 数据状态 + * @return hql + */ + public static String packHqlIdsAndIsDeleted(String columnName, String[] params, Integer isDeleted) { + StringBuffer result = new StringBuffer(FormHqlPack.packHqlIds(columnName, params)); + + HqlPack.getNumEqualPack(isDeleted, "isDeleted", result); + return result.toString(); + } + + + /** + * In 参数封装 + * @param columnName 列名 + * @param params 参数 + * @param isDeleted 数据状态 + * @return hql + */ + public static String packHqlIdsAndIsDeleted(String columnName, Long[] params, Integer isDeleted) { + StringBuffer result = new StringBuffer(FormHqlPack.packHqlIds(columnName, params)); + + HqlPack.getNumEqualPack(isDeleted, "isDeleted", result); + return result.toString(); + } + + /** * 表单布局复杂查询 * @param bfLayout 表单布局 * @return hql diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java similarity index 95% rename from modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java rename to modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java index 5106375..144cf36 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderdetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebProcurementPlanOrderDetails.java @@ -26,7 +26,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("开口合同明细表") -public class SwebProcurementPlanOrderdetails extends BaseBean { +public class SwebProcurementPlanOrderDetails extends BaseBean { @ApiParam("单据号") @Column(name = "ORDER_NO") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java new file mode 100644 index 0000000..5d8568c --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebOrderDeliveryLogRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebOrderDeliveryLog; + +/** + * @Description :订单发货通知记录表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebOrderDeliveryLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java new file mode 100644 index 0000000..caff5af --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPackageRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPackage; + +/** + * @Description :物理包装 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebPackageRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java new file mode 100644 index 0000000..3f52f37 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderDetailsRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebProcurementPlanOrderDetails; + +/** + * @Description :开口合同明细表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebProcurementPlanOrderDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java new file mode 100644 index 0000000..5795ba0 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebProcurementPlanOrderRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPackage; +import cn.estsh.i3plus.pojo.sweb.bean.SwebProcurementPlanOrder; + +/** + * @Description :开口合同主表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebProcurementPlanOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java new file mode 100644 index 0000000..8efe954 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseChangeLogRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseChangeLog; + +/** + * @Description :订单修改日志记录表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebPurchaseChangeLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java new file mode 100644 index 0000000..dfd6da4 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderDetailsRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrderDetails; + +/** + * @Description :采购订单表-明细表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebPurchaseOrderDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java new file mode 100644 index 0000000..6ef21fb --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder; + +/** + * @Description :采购订单表-主表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebPurchaseOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java new file mode 100644 index 0000000..00477a6 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebPurchaseOrderSnRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrderSn; + +/** + * @Description :采购订单表-条码明细表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebPurchaseOrderSnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java new file mode 100644 index 0000000..f3ed325 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/repository/SwebVendorRelRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.sweb.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.sweb.bean.SwebVendorRel; + +/** + * @Description :供应商关系表 dao + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 14:51 + * @Modify: + **/ +public interface SwebVendorRelRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java new file mode 100644 index 0000000..0468770 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/sqlpack/SwebHqlPack.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.sweb.sqlpack; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.base.tool.SqlPack; +import cn.estsh.i3plus.pojo.sweb.bean.SwebPurchaseOrder; +import org.apache.commons.lang3.StringUtils; + +/** + * @Description : hql 封装 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-04-01 17:59 + * @Modify: + **/ +public class SwebHqlPack { + + /** + * 通用封装isValid、isDeleted等参数 + * @param bean + * @param hqlStr + * @return + */ + private static String buildHql(BaseBean bean, StringBuffer hqlStr){ + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + return hqlStr.toString(); + } + + public static String getPurchaseOrderWhereHql(SwebPurchaseOrder purchaseOrder){ + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(purchaseOrder.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(purchaseOrder.getVendorCode(), "vendorCode", result); + HqlPack.getNumEqualPack(purchaseOrder.getOrderStatus(), "orderStatus", result); + return buildHql(purchaseOrder,result); + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index f1c8cf5..b6684c8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -109,14 +109,14 @@ public class WmsCSOrderDetails extends BaseBean { public WmsCSOrderDetails(){} - public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName){ + public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String partName,String whNo,String zoneNo,String locateNo){ this.qty = qty; this.partNo = partNo; this.orderNo = orderNo; + this.partNameRdd = partName; this.whNo = whNo; this.zoneNo = zoneNo; this.locateNo = locateNo; - this.partNameRdd = partName; } public WmsCSOrderDetails(Double qty, String partNo,String orderNo,String whNo,String zoneNo,String locateNo,String partName,String sn){ 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 eeeff68..2639206 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 @@ -145,6 +145,10 @@ public class WmsDocMovementDetails extends BaseBean { private String actualLot; @Transient + @ApiParam("实际数量") + private Double actualQty; + + @Transient @ApiParam("推荐批次") private String recommondLot; @@ -152,5 +156,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("推荐库位") private String recommondLocateNo; + @Transient + @ApiParam("前端表格编辑使用") + private Boolean isSet = false; + public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } + + public Double getOutQty() {return outQty == null ? 0L : this.outQty.doubleValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index 1a0230a..036230c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/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; } 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 e181f09..2a8209b 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 @@ -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; } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 09e3519..089b84c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -177,4 +177,6 @@ public class WmsStockSn extends BaseBean { } public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); } + + public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();} } 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 e74178b..51f5e00 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 @@ -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); @@ -1036,15 +1036,6 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsQCMaster.getIsPart(),"isPart",result); //单号 HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); - //业务类型 - HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); - //关联单据类型 - HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); - //关联单据号 - HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); - //入库单号 - HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result); - getStringBuilderPack(wmsQCMaster, result); return result.toString(); @@ -1515,7 +1506,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); HqlPack.getInPackString(data,columnName,result); - HqlPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", result); + HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result); getStringBuilderPack(bean, result); return result.toString(); }