From 0ce23f95b189efc5638f99c0ee24af6b49e48834 Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Fri, 8 Mar 2019 18:44:18 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E6=8B=86=E5=88=86=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2f30f9b..6d3064e 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 @@ -1313,8 +1313,8 @@ public class WmsHqlPack { public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringLikerPack(wmsStockSn.getSn(),"sn", result); - HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); getStringBuilderPack(wmsStockSn, result); + HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); return result.toString(); } From d41a4f0dc932cb93fa182a9dbb43c2a83a684420 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Fri, 8 Mar 2019 18:54:22 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E6=8F=90=E4=BA=A4NC=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 5c4d7c6..2150f1d 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 @@ -596,14 +596,15 @@ public class WmsEnumUtil { ALLOCATION(40, "ALLOCATION", "调拨"), SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"), SCATTERED_IN(60, "SCATTERED_IN", "零星入库"), - NC_WAREHOSING(70, "NC_WAREHOSING", "NC入库"), + NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"), SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"), CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"), PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"), INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"), SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"), RECEIVING_IN(130, "RECEIVING_IN", "收货入库"), - OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"); + OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"), + NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"); private int value; private String code; From e28dfa55c6ba2b1d4754f22d78c43ecd79bc8e3d Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 8 Mar 2019 19:06:06 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8Bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index 6ffb2b2..bfa9604 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -78,10 +78,10 @@ public class ReportHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result); if(template.getTemplateStatus() != null && - template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue()){ + template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue()){ HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result); }else { - HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_FULFIL.getValue(),"templateStatus",result); + HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); } HqlPack.getStringLikerPack(template.getName(),"name",result); From b667d6840e5aa3e1446fbccf4fb6e7ce0a7c8c82 Mon Sep 17 00:00:00 2001 From: "Jack.lv" Date: Fri, 8 Mar 2019 19:16:49 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=92=8C=E6=A0=B9=E6=8D=AE=E6=9D=83=E9=99=90=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/DataAuthEnumUtil.java | 45 +++++++++++++++ .../pojo/wms/repository/WmsDataAuthRepository.java | 19 +++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 66 ++++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataAuthRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java new file mode 100644 index 0000000..6c4d4c3 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : wms数据权限枚举 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-3-8 15:53 + * @Modify: + **/ +public class DataAuthEnumUtil { + + /** + * 数据对象枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_OBJ_TYPE { + WAREHOUSE("10", "WAREHOUSE", "仓库对象"), + ZONE("20", "ZONE", "存储区对象"), + LOCATE("30", "LOCATE", "库位对象"); + + private String code; + private String description; + String value; + + DATA_OBJ_TYPE(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataAuthRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataAuthRepository.java new file mode 100644 index 0000000..7064482 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsDataAuthRepository.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WareHouse; +import cn.estsh.i3plus.pojo.wms.bean.WmsDataAuth; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @Description : wms数据权限 + * @Reference : + * @Author : jack.lv + * @CreateDate : 2019-03-08 14:47 + * @Modify: + **/ +@Repository +public interface WmsDataAuthRepository extends BaseRepository { +} 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 8a923bd..046704d 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 @@ -2,13 +2,18 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.DataAuthEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; /** * @Description : 仓库管理对象封装 @@ -1317,4 +1322,65 @@ public class WmsHqlPack { getStringBuilderPack(wmsStockQuan, result); return result.toString(); } + + /** + * 根据用户角色id列表查询数据权限信息 + * @param roleIds + * @return + */ + public static String packHqlWmsDataAuth(List roleIds) { + StringBuffer result = new StringBuffer(); + String data = String.join(",", roleIds); + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(data,"roleCode",result); + getStringBuilderPack(new WmsDataAuth(), result); + return result.toString(); + } + + /** + * 根据权限数据拼查询任务详情sql + * @param groupDataAuth + * @return + */ + public static String packHqlWmsTaskDetail(Map> groupDataAuth) { + StringBuffer result = new StringBuffer(); + Set>> entries = groupDataAuth.entrySet(); + String warehouse = DataAuthEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue(); + String locate = DataAuthEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue(); + String zone = DataAuthEnumUtil.DATA_OBJ_TYPE.ZONE.getValue(); + //拼sql + entries.stream().filter(o->!Strings.isNullOrEmpty(o.getKey())).forEach(o->{ + List value = o.getValue(); + List vList = value.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList()); + String data = String.join(",", vList); + if(warehouse.equals(o.getKey())){ + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(data,"destWhNo",result); + } + if(locate.equals(o.getKey())){ + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(data,"destLocateNo",result); + } + if(zone.equals(o.getKey())){ + // 参数数组 [1,2,3] -> "1,2,3" + HqlPack.getInPack(data,"destZoneNo",result); + } + }); + getStringBuilderPack(new WmsDataAuth(), result); + return result.toString(); + } + + /** + * 给定字段动态in sql + * @param columnName + * @param vals + * @return + */ + public static String packHqlAndIn(BaseBean bean,String columnName,List vals) { + StringBuffer result = new StringBuffer(); + String data = String.join(",", vals); + HqlPack.getInPack(data,columnName,result); + getStringBuilderPack(bean, result); + return result.toString(); + } } From d89770e13890a808a872bcdff6b20fe3fe1100a7 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Fri, 8 Mar 2019 20:16:24 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java | 10 +++++++++- .../estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java | 10 ++++++---- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index d71b02d..34ab3f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -24,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TASK_DETAILS") +@Table(name = "WMS_TASK_DETAILS") @Api("作业任务明细信息") public class WmsTaskDetails extends BaseBean { @@ -109,4 +109,12 @@ public class WmsTaskDetails extends BaseBean { @Column(name = "REF_SRC") @ApiParam(value = "关联单据编号") private String refSrc; + + @Column(name = "SRC_AREA_NO") + @ApiParam("源库存地代码") + public String srcAreaNo; + + @Column(name = "DEST_AREA_NO") + @ApiParam("目的库存地代码") + public String destAreaNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java index 0be658a..68faeba 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,10 +10,7 @@ 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; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -24,6 +22,10 @@ import java.util.List; **/ @Data @Api("单据明细Model") +@Entity +//以子类table为准 +@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) +@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 public class WmsOrderDetailsModel extends BaseBean { @Column(name = "PART_NO") 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 2f30f9b..71a1a1a 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 @@ -83,7 +83,7 @@ public class WmsHqlPack { * @param orderNos * @return */ - public static String packHqlWmsDocMovementDetailsByOrderNos(List orderNos) { + public static String packWmsOrderDetailsByOrderNos(List orderNos) { StringBuffer result = new StringBuffer(); StringBuffer orderNoStr = new StringBuffer(); for (int i = 0; i < orderNos.size(); i++) { From 1fd8e5e76fe0f15f5edfca0fddae6fbb93030b6d Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Sun, 10 Mar 2019 09:33:35 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java | 12 ++++++++++++ .../i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java | 10 ++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java index 0004a3f..fa26efe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocatePart.java @@ -39,4 +39,16 @@ public class WmsLocatePart extends BaseBean{ @Column(name="PART_NAME_RDD") @ApiParam(value ="物料名称") private String partNameRdd; + + @Column(name = "PULL_QTY") + @ApiParam(value = "拉动数量", example = "0") + private Double pullQty; + + @Column(name = "MAX") + @ApiParam(value = "最大值", example = "0") + private Double max; + + @Column(name = "MIN") + @ApiParam(value = "最小值", example = "0") + private Double min; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java index 0be658a..755af50 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,10 +10,7 @@ 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; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -23,6 +21,10 @@ import java.util.List; * @Modify: **/ @Data +@Entity +//以子类table为准 +@javax.persistence.Inheritance(strategy= InheritanceType.TABLE_PER_CLASS) +@JsonInclude(value = JsonInclude.Include.NON_EMPTY) @Api("单据明细Model") public class WmsOrderDetailsModel extends BaseBean { From 7e8965421e721e8e7d2180f6800b846e4b1cd3b6 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sun, 10 Mar 2019 10:07:09 +0800 Subject: [PATCH 07/20] WmsOrderDetailsModel --- .../java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java index d4da820..755af50 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java @@ -26,10 +26,6 @@ import java.util.List; @javax.persistence.Inheritance(strategy= InheritanceType.TABLE_PER_CLASS) @JsonInclude(value = JsonInclude.Include.NON_EMPTY) @Api("单据明细Model") -@Entity -//以子类table为准 -@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) -@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 public class WmsOrderDetailsModel extends BaseBean { @Column(name = "PART_NO") From f662140075844d166cefd819758c7b3da2ad121c Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sun, 10 Mar 2019 10:14:28 +0800 Subject: [PATCH 08/20] =?UTF-8?q?WmsOrderMasterModel=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 26 ++++++++++++- .../i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 26 ++++++++++++- .../pojo/wms/bean/WmsDocMovementDetails.java | 26 ++++++++++++- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 26 ++++++++++++- .../estsh/i3plus/pojo/wms/bean/WmsQCDetails.java | 44 ++++++++++++++++------ 5 files changed, 129 insertions(+), 19 deletions(-) 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 a694def..5d5d293 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,7 +27,30 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_ASN_DETAILS") @Api("ASN订单明细信息") -public class WmsASNMasterDetails extends WmsOrderDetailsModel { +public class WmsASNMasterDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "PO_ITEM") @ApiParam("PO行号") 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 e28e2c0..c4a8117 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,7 +26,30 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_CS_DETAILS") @Api("盘点单冻结信息") -public class WmsCSOrderDetails extends WmsOrderDetailsModel { +public class WmsCSOrderDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "WH_NO") @ApiParam("仓库代码") 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 32d1581..a8fd0f0 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,7 +26,30 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_MOVEMENT_DETAILS") @Api("移库单明细表") -public class WmsDocMovementDetails extends WmsOrderDetailsModel { +public class WmsDocMovementDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") 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 fda45d5..6e62522 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,7 +26,30 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_PO_DETAILS") @Api("PO订单明细信息") -public class WmsPOMasterDetails extends WmsOrderDetailsModel { +public class WmsPOMasterDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "PRINT_QTY") @ApiParam(value = "条码打印数量", example = "0") 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 2d12d58..5639e4c 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -26,41 +25,64 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_QC_DETAILS") +@Table(name = "WMS_QC_DETAILS") @Api("质检单明细信息") -public class WmsQCDetails extends WmsOrderDetailsModel { +public class WmsQCDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; /** * 状态:N=正常,C=行取消 */ - @Column(name="ITEM_STATUS") + @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") public Integer itemStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; - @Column(name="FACT_QTY") + @Column(name = "FACT_QTY") @ApiParam(value = "实检数量", example = "0") public Double factQty; - @Column(name="PASS_QTY") + @Column(name = "PASS_QTY") @ApiParam(value = "合格数量", example = "0") public Double passQty; - @Column(name="REJECT_QTY") + @Column(name = "REJECT_QTY") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; - @Column(name="QC_USER") + @Column(name = "QC_USER") @ApiParam("检验员") public String qcUser; - @Column(name="QC_TIME") + @Column(name = "QC_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="检验时间",example = "2000-01-01 01:00:00") + @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00") public String qcTime; } From 398a3d98c5255ac0a7eb1211bcd17e6f39bc697c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Sun, 10 Mar 2019 17:43:49 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0POJO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java | 9 +++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java | 8 ++++++++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 10 +++++++--- 4 files changed, 25 insertions(+), 4 deletions(-) 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 822d2f7..3504d07 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 @@ -909,7 +909,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum TASK_INFO_STATUS { - CREATE(10, "创建"), FINISH(20, "待处理"), FAIL(30, "已处理"); + CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java index 496428d..ac49208 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/TransSnModle.java @@ -29,4 +29,13 @@ public class TransSnModle extends BaseComponetsParam{ @ApiParam(value = "分组编号") public String packageNo; + /** + * 针对抽点 + */ + public double cpQty; + + /** + * 供应商批次 + */ + public String dateCode; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java index a27823a..627176c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java @@ -29,6 +29,14 @@ import javax.persistence.Transient; @Api("抽点记录信息") public class WmsCheckFactRecord extends BaseBean { + @Column(name = "REF_TYPE") + @ApiParam(value = "关联单据类型") + private String refType; + + @Column(name = "REF_SRC") + @ApiParam(value = "关联单据编号") + private String refSrc; + @Column(name="PO_NO") @ApiParam("采购单号") public String poNo; 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 d359972..30ae352 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 @@ -49,19 +49,23 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "数量", example = "0") public Double qty; +// @Column(name="TRANS_QTY") +// @ApiParam(value = "处理数量", example = "0") +// public Double transQty; + @Column(name="UNIT") @ApiParam("单位") public String unit; /** - * 状态:10 = 创建，20 = 已打印，30 = 已收货 + * 状态:同库存条码状态一致 */ @Column(name="SN_STATUS") @ApiParam(value = "状态", example = "10") public Integer snStatus; - @Column(name="SN_1D") + @Column(name="SN") @ApiParam("一维条码") - public String snOneBarCode; + public String sn; } From 31d91f48b35d9b5835f9d0eec93a56522a0a211a Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sun, 10 Mar 2019 19:21:31 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 104 +++++++++------------ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 6 +- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 7 +- .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 16 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 32 +++---- .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 86 ++++++++--------- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 +- 7 files changed, 123 insertions(+), 136 deletions(-) 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 822d2f7..8f27202 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 @@ -94,6 +94,39 @@ public class WmsEnumUtil { } /** + * 移库单主表：优先级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRIORITY { + NORMAL(1, "正常"), URGENT(2, "紧急"); + private int value; + private String description; + + PRIORITY(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; + } + } + + /** * 订单明细信息 状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -250,22 +283,20 @@ public class WmsEnumUtil { } /** - * 主表信息 状态 + * 移库单主表状态；质检单主表状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_STATUS { - CREATE(1, "新建"), - RECEIPT(10, "收货中"), - RECEIPT_FINISH(20, "收货完成"), - WAREHOUSING(30, "入库中"), - WAREHOUSING_FINISH(40, "入库完成"), - CLOSED(50, "已关闭"), - CANCELLED(60, "已取消"); + public enum MASTER_ORDER_STATUS { + CREATE(10, "新建"), + RECEIPT(20, "处理中"), + RECEIPT_FINISH(30, "已完成"), + CLOSED(40, "已关闭"), + CANCELLED(50, "已取消"); private int value; private String description; - ORDER_STATUS(int value, String description) { + MASTER_ORDER_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -698,53 +729,6 @@ public class WmsEnumUtil { } } - /** - * 外部单据：移库单状态 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum OUT_MOVEMENT_STATUS { - CREATE(10, "新建"), - RECEIPT(20, "处理中"), - RECEIPT_FINISH(30, "已完成"), - CLOSED(40, "已关闭"), - CANCELLED(50, "已取消"); - - private int value; - private String description; - - OUT_MOVEMENT_STATUS(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; - } - - public static int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; - } - } - return tmp; - } - } /** * 物料：分类（ABC） @@ -1261,8 +1245,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum QC_INFO_TYPE { - FEED(1, "进料检验"), - ONLINE(10, "在线检验"), + FEED(10, "进料检验"), + ONLINE(20, "在线检验"), EMDPRODUCT(30, "成品检验"), SHIPMENTS(40, "出货检验"); @@ -1777,6 +1761,8 @@ public class WmsEnumUtil { OP_SEQ("OP_SEQ", "作业类型序号"), TRAN_SEQ("TRAN_SEQ", "交易类型序号"), STEP_SEQ("STEP_SEQ", "步骤调用序号"), + MOVE_ORDER_NO("MOVE_ORDER_NO", "移库单单号"), + QC_ORDER_NO("QC_ORDER_NO", "质检单单号"), ORDER_NO("ORDER_NO", "盘点主表序号"); private String code; 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 d359972..be60f60 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 @@ -61,7 +61,7 @@ public class WmsDocMovementSn extends BaseBean { @ApiParam(value = "状态", example = "10") public Integer snStatus; - @Column(name="SN_1D") - @ApiParam("一维条码") - public String snOneBarCode; + @Column(name="SN") + @ApiParam("条码") + public String sn; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index 2036d64..cfb386c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -53,10 +53,6 @@ public class WmsMoveDetails extends BaseBean { @ApiParam("客户编号") public String custNo; - @Transient - @ApiParam(value = "需求数量", example = "0") - public Double qty; - @Column(name="TRANS_QTY") @ApiParam(value = "处理数量", example = "0") public Double transQty; @@ -127,9 +123,8 @@ public class WmsMoveDetails extends BaseBean { this.finishedCounts = finishedCounts; } - public WmsMoveDetails(String partNo, double qty ,double transQty){ + public WmsMoveDetails(String partNo, double transQty){ this.partNo = partNo; - this.qty = qty; this.transQty = transQty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index b4d7163..2831670 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -76,10 +76,26 @@ public class WmsMoveSn extends BaseBean { @ApiParam(value = "源数量", example = "0") public Double srcQty; + @Column(name="SRC_WH_NO") + @ApiParam("源仓库代码") + public String srcWhNo; + + @Column(name="SRC_ZONE_NO") + @ApiParam("源存储区代码") + public String srcZoneNo; + @Column(name="SRC_LOCATE_NO") @ApiParam("源库位代码") public String srcLocateNo; + @Column(name="DEST_WH_NO") + @ApiParam("目标仓库代码") + public String destWhNo; + + @Column(name="DEST_ZONE_NO") + @ApiParam("目标存储区代码") + public String destZoneNo; + @Column(name="DEST_LOCATE_NO") @ApiParam("目标库位代码") public String destLocateNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index ca40ead..59bb3ef 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -25,11 +25,11 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_QC_MASTER") +@Table(name = "WMS_QC_MASTER") @Api("质检单主表信息") public class WmsQCMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("单号") public String orderNo; @@ -37,47 +37,47 @@ public class WmsQCMaster extends BaseBean { * 业务类型:IQC=进料检验,IPQC=在线检验, * FQC=成品检验,OQC=出货检验 */ - @Column(name="ORDER_TYPE") + @Column(name = "ORDER_TYPE") @ApiParam(value = "业务类型", example = "0") public Integer orderType; /** * 状态:1=创建,5=待处理,10=已完成,90=已关闭,91=已取消 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") public Integer orderStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; - @Column(name="CUSTOMER_NO") + @Column(name = "CUSTOMER_NO") @ApiParam("客户编号") public String customerNo; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO") @ApiParam("供应商编号") public String vendorNo; - @Column(name="VERSION") + @Column(name = "VERSION") @ApiParam(value = "版本", example = "1") public Integer version; - @Column(name="PO_NO") - @ApiParam("采购单号") - public String poNo; + @Column(name = "REF_TYPE") + @ApiParam("关联单号类型") + public String refType; - @Column(name="ASN_NO") - @ApiParam("ASN单号") - public String asnNo; + @Column(name = "REF_SRC") + @ApiParam("关联单号") + public String refSrc; - @Column(name="IB_NO") + @Column(name = "IB_NO") @ApiParam("入库单号") public String ibNo; @Transient - @ApiParam(value ="客户简称") + @ApiParam(value = "客户简称") private String custName; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index fa7b83f..9b80d12 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -28,81 +28,71 @@ import javax.persistence.Table; @Api("库存交易信息") public class WmsTransQuan extends BaseBean { + @Column(name = "TRANS_NO") + @ApiParam(value = "事务编号") + private String transNo; + @Column(name = "WH_NO") - @ApiParam("仓库代码") - public String whNo; + @ApiParam(value = "仓库代码") + private String whNo; @Column(name = "ZONE_NO") - @ApiParam("存储区编号") - public String zoneNo; + @ApiParam(value = "存储区编号") + private String zoneNo; @Column(name = "LOCATE_NO") - @ApiParam("库位编号") - public String locateNo; + @ApiParam(value = "库位编号") + private String locateNo; @Column(name = "PART_NO") - @ApiParam("物料编码") - public String partNo; + @ApiParam(value = "零件编号") + private String partNo; @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - public String partNameRdd; - - @Column(name = "SN") - @ApiParam("条码") - public String sn; + @ApiParam(value = "零件名称") + private String partNameRdd; @Column(name = "UNIT") - @ApiParam("单位") - public String unit; - - /** - * 关联交易类型表 - */ - @Column(name = "TRANS_CODE") - @ApiParam(value = "交易类型代码") - public String transCode; + @ApiParam(value = "单位") + private String unit; @Column(name = "QTY") - @ApiParam(value = "交易数量", example = "0") - public Double qty; + @ApiParam(value = "交易数量", example = "1") + private Double qty; @Column(name = "REJECT_QTY") - @ApiParam(value = "不合格交易数量", example = "0") - public Double rejectQty; + @ApiParam(value = "不合格交易数量", example = "1") + private Double rejectQty; - @Column(name = "TRANS_NO") - @ApiParam(value = "事务编号") - public String transNo; + @Column(name = "TRANS_STATUS") + @ApiParam(value = "状态", example = "10") + private Integer transStatus; - /** - * ASN,PO,SO - */ @Column(name = "REF_TYPE") @ApiParam(value = "关联单据类型") - public String refType; + private String refType; + + @Column(name = "BUSI_TYPE") + @ApiParam(value = "业务类型", example = "10") + private Integer busiType; @Column(name = "REF_SRC") @ApiParam(value = "关联单号") - public String refSrc; + private String refSrc; - @Column(name = "TRANS_STATUS") - @ApiParam(value = "状态", example = "1") - public Integer transStatus; + @Column(name = "TRANS_CODE") + @ApiParam(value = "交易代码") + private String transCode; - @Column(name = "ERROR_MESSAGE") - @ApiParam(value = "错误信息") - public String errorMessage; - - @Column(name = "CUST_NO") - @ApiParam(value = "客户编号") - private String custNo; + @Column(name = "MOVE_NO") + @ApiParam(value = "库存移动单号") + private String moveNo; @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; - @Column(name="MOVE_NO") - @ApiParam("移动单号") - public String moveNo; + @Column(name = "CUST_NO") + @ApiParam(value = "客户编号") + private String custNo; } 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 69ed831..048fea8 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 @@ -955,10 +955,10 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsQCMaster.getOrderNo(), "orderNo", result); //业务类型 HqlPack.getNumEqualPack(wmsQCMaster.getOrderType(), "orderType", result); - //采购单号 - HqlPack.getStringEqualPack(wmsQCMaster.getPoNo(), "poNo", result); - //ASN单号 - HqlPack.getStringEqualPack(wmsQCMaster.getAsnNo(), "asnNo", result); + //关联单据类型 + HqlPack.getStringEqualPack(wmsQCMaster.getRefType(), "refType", result); + //关联单据号 + HqlPack.getStringEqualPack(wmsQCMaster.getRefSrc(), "refSrc", result); //入库单号 HqlPack.getStringEqualPack(wmsQCMaster.getIbNo(), "ibNo", result); From 274c5aec26a28f1edb031947cc1461e81cb3e9d8 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Mon, 11 Mar 2019 11:03:45 +0800 Subject: [PATCH 11/20] dragon --- .../cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java | 21 ++++++++++----------- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 1 + 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index b472d44..8707b77 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,14 +47,6 @@ public class WmsOpType extends BaseBean { @ApiParam(value = "序号", example = "0") private Integer seq; - @Column(name = "TM_ID") - @ApiParam(value = "交易处理组件ID", example = "0") - private Integer tmId; - - @Column(name = "DATA_SRC") - @ApiParam("数据来源") - private String dataSrc; - @Column(name = "ORDER_MIN") @ApiParam(value = "单据处理下限", example = "0") private Integer orderMin; @@ -103,7 +97,12 @@ public class WmsOpType extends BaseBean { @ApiParam(value = "是否允许多人操作", example = "0") private Integer isMuliti; - @Transient - @ApiParam(value = "单据集") - private List> orderList; + @Column(name = "TM_ID") + @ApiParam(value = "处理组件编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long tmId; + + @Column(name = "DATA_SRC") + @ApiParam("数据来源") + private String dataSrc; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index 36ac8e9..a6766aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -51,6 +51,7 @@ public class WmsTaskSrc extends BaseBean { @Column(name = "TRANS_CODE") @ApiParam("默认交易类型") public String transCode; + @Column(name = "IS_ONE_STEP") @ApiParam("是否一步法") public Integer isOneStep; From 03fe15e2f4d7fbf9804697e77a24cbd318bd87b1 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Mon, 11 Mar 2019 13:12:43 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java | 8 ++++---- .../cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java index cc02e4e..e8a2dbd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockReportEnumUtil.java @@ -533,10 +533,10 @@ public class BlockReportEnumUtil { LIKE_LEFT(6, "LIKE", "左模糊"), LIKE_RIGHT(7, "LIKE", "右模糊"), EQUAL(8, "=", "等于"), - EQUAL_NOT(9, "!=", "不等于"), - AND(10, "AND", "AND"), - OR(11, "OR", "OR"), - NOT(12, "NOT", "NOT"), + EQUAL_NOT(9, "<>", "不等于"), +// AND(10, "AND", "AND"), +// OR(11, "OR", "OR"), +// NOT(12, "NOT", "NOT"), IS_NULL(13, "IS NULL", "IS NULL"), IS_NOT_NULL(14, "IS NOT NULL", "IS NOT NULL"); diff --git a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java index bfa9604..db477bd 100644 --- a/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java +++ b/modules/i3plus-pojo-report/src/main/java/cn/estsh/i3plus/pojo/report/sqlpack/ReportHqlPack.java @@ -77,11 +77,12 @@ public class ReportHqlPack { // 查询参数封装 HqlPack.getNumEqualPack(template.getTemplateType(),"templateType",result); - if(template.getTemplateStatus() != null && - template.getTemplateStatus().intValue() == BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue()){ - HqlPack.getNumEqualPack(template.getTemplateStatus(),"templateStatus",result); - }else { - HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); + if(template.getTemplateStatus() != null){ + if(template.getTemplateStatus().intValue() == CommonEnumUtil.USER_STATUS.DISABLE.getValue()){ + HqlPack.getNumEqualPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); + }else { + HqlPack.getNumSmallerPack(BlockReportEnumUtil.TEMPLATE_STATUS.SAVE_TEMPLATE_ATTR_CONFIRM.getValue(),"templateStatus",result); + } } HqlPack.getStringLikerPack(template.getName(),"name",result); From 2943bfcf9fd7c7c9e0a878a5b32f1a2148116566 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 11 Mar 2019 19:57:14 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=BB=E5=8A=A1=E8=AE=A1=E5=88=92=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java index 9e2eff3..58f2528 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefTaskCyclePlan.java @@ -35,6 +35,11 @@ public class SysRefTaskCyclePlan extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long taskCycleId; + @Column(name="TASK_PLAN_ID") + @ApiParam(value ="任务计划id" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long taskPlanId; + @Column(name="TASK_PLAN_NAME") @ApiParam(value ="任务计划名称") private String taskPlanName; From d289e7009a72566edd457df95319b2342af6c87d Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Mon, 11 Mar 2019 21:13:14 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=98=8E=E7=BB=86=E8=A1=A8=20=20=E5=B7=B2?= =?UTF-8?q?=E7=A7=BB=E5=BA=93=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) 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 a8fd0f0..2568b63 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 @@ -120,6 +120,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "已收货数量", example = "1") private Double recQty; + @Column(name = "MOVE_QTY") + @ApiParam(value = "已移库数量", example = "1") + private Double moveQty; + @Column(name = "SRC_AREA_NO") @ApiParam("源库存地代码") public String srcAreaNo; From 9a6a9018cf818dcf49fa7f94310f64bf08ec4dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 11 Mar 2019 21:18:17 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 90 +++++++++++----------- 1 file changed, 45 insertions(+), 45 deletions(-) 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 3504d07..2c215e7 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 @@ -347,51 +347,51 @@ public class WmsEnumUtil { } } - /** - * PO条码状态信息 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SN_DETAILS_STATUS { - CREATE(10, "新建"), - WAREHOUSING(30, "已打印"), - RECEIPT_FINISH(20, "已收货"); - - private int value; - private String description; - - SN_DETAILS_STATUS(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; - } - - public static int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; - } - } - return tmp; - } - } +// /** +// * PO条码状态信息 +// */ +// @JsonFormat(shape = JsonFormat.Shape.OBJECT) +// public enum SN_DETAILS_STATUS { +// CREATE(10, "新建"), +// WAREHOUSING(30, "已打印"), +// RECEIPT_FINISH(20, "已收货"); +// +// private int value; +// private String description; +// +// SN_DETAILS_STATUS(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; +// } +// +// public static int descOf(String desc) { +// int tmp = 1; +// for (int i = 0; i < values().length; i++) { +// if (values()[i].description.equals(desc)) { +// tmp = values()[i].value; +// } +// } +// return tmp; +// } +// } /** * 消息队列，队列名称 From d2190c55c77d68bbeb6588e326df853b78d03c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 11 Mar 2019 21:44:47 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 90 +++++++++++----------- 1 file changed, 45 insertions(+), 45 deletions(-) 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 63ee5c5..ca1e277 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 @@ -378,51 +378,51 @@ public class WmsEnumUtil { } } -// /** -// * PO条码状态信息 -// */ -// @JsonFormat(shape = JsonFormat.Shape.OBJECT) -// public enum SN_DETAILS_STATUS { -// CREATE(10, "新建"), -// WAREHOUSING(30, "已打印"), -// RECEIPT_FINISH(20, "已收货"); -// -// private int value; -// private String description; -// -// SN_DETAILS_STATUS(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; -// } -// -// public static int descOf(String desc) { -// int tmp = 1; -// for (int i = 0; i < values().length; i++) { -// if (values()[i].description.equals(desc)) { -// tmp = values()[i].value; -// } -// } -// return tmp; -// } -// } + /** + * PO条码状态信息 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SN_DETAILS_STATUS { + CREATE(10, "新建"), + WAREHOUSING(30, "已打印"), + RECEIPT_FINISH(20, "已收货"); + + private int value; + private String description; + + SN_DETAILS_STATUS(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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } /** * 消息队列，队列名称 From 8ac4046a7d1ab2634bef09b9d885109f599ab5bd Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 11 Mar 2019 22:34:42 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=92=8C=E8=8E=B7=E5=8F=96=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E5=85=AC=E7=94=A8=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/DataAuthEnumUtil.java | 45 ------------------ .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 45 ++++++++++++++++-- .../cn/estsh/i3plus/pojo/base/tool/HqlPack.java | 26 +++++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 54 ++++++++++++++-------- 4 files changed, 102 insertions(+), 68 deletions(-) delete mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java deleted file mode 100644 index 6c4d4c3..0000000 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/DataAuthEnumUtil.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.estsh.i3plus.pojo.base.enumutil; - -import com.fasterxml.jackson.annotation.JsonFormat; - -/** - * @Description : wms数据权限枚举 - * @Reference : - * @Author : jack.lv - * @CreateDate : 2019-3-8 15:53 - * @Modify: - **/ -public class DataAuthEnumUtil { - - /** - * 数据对象枚举 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DATA_OBJ_TYPE { - WAREHOUSE("10", "WAREHOUSE", "仓库对象"), - ZONE("20", "ZONE", "存储区对象"), - LOCATE("30", "LOCATE", "库位对象"); - - private String code; - private String description; - String value; - - DATA_OBJ_TYPE(String value, String code, String description) { - this.value = value; - this.code = code; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getCode() { - return code; - } - - public String getDescription() { - return description; - } - } -} 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 ca1e277..c22bdc9 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 @@ -1819,18 +1819,53 @@ public class WmsEnumUtil { } /** - * 可选项类型枚举 + * 数据对象枚举 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_OBJ_TYPE { + WAREHOUSE(10, "WAREHOUSE", "仓库对象"), + ZONE(20, "ZONE", "存储区对象"), + LOCATE(30, "LOCATE", "库位对象"), + MATERIAL(40, "MATERIAL", "物料对象"); + + private String code; + private String description; + int value; + + DATA_OBJ_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + /** + * 数据操作枚举 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DATA_ROLE_TYPE { - WAREHOUSE(1, "WAREHOUSE", "仓库"), - STOCK(2, "STOCK", "库存"); + public enum DATA_OBJ_OP_TYPE { + ADD(10, "ADD", "新增"), + DEL(20, "DEL", "删除"), + UPD(30, "UPD", "修改"), + QUERY(40, "QUERY", "查询"); private String code; private String description; int value; - DATA_ROLE_TYPE(int value, String code, String description) { + DATA_OBJ_OP_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java index c01e38b..802e693 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/HqlPack.java @@ -451,6 +451,32 @@ public class HqlPack { * @param columnName * @param result */ + public static void getInOrPackString(String data,String columnName, StringBuffer result){ + if (data != null && data.trim().length()>0) { + data = getSafeParam(data); + //判断最后一位是不是逗号 + if(data.lastIndexOf(",") != (data.length()-1)){ + data += ","; + } + String[] dataArray = data.substring(0, data.length()-1).split(","); + data = ""; + for (int i = 0 ; i < dataArray.length ;i++) { + if(i == dataArray.length -1){ + data += "'" + dataArray[i] + "'"; + }else{ + data += "'" + dataArray[i] + "',"; + } + } + result.append(" or model."+columnName+" in ( "+ data+ " )"); + } + } + + /** + * 封装in String查询语句 + * @param data + * @param columnName + * @param result + */ public static void getNotInPackString(String data,String columnName, StringBuffer result){ if (data != null && data.trim().length()>0) { data = getSafeParam(data); 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 048fea8..f039f32 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 @@ -2,19 +2,22 @@ package cn.estsh.i3plus.pojo.wms.sqlpack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.DataAuthEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; +import com.sun.org.apache.xerces.internal.xs.datatypes.ObjectList; import org.apache.commons.lang3.StringUtils; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import static com.alibaba.fastjson.JSON.parseArray; + /** * @Description : 仓库管理对象封装 * @Reference : @@ -1344,13 +1347,23 @@ public class WmsHqlPack { public static String packHqlWmsDataAuth(List roleIds) { StringBuffer result = new StringBuffer(); String data = String.join(",", roleIds); - // 参数数组 [1,2,3] -> "1,2,3" HqlPack.getInPack(data,"roleCode",result); getStringBuilderPack(new WmsDataAuth(), result); return result.toString(); } /** + * 根据用户角色id列表查询数据权限信息 + * @return + */ + public static String packHqlWmsDataAuth(WmsDataAuth dataAuth) { + StringBuffer result = new StringBuffer(); + HqlPack.getStringEqualPack(dataAuth.getDataObj() ,"dataObj", result); + getStringBuilderPack(new WmsDataAuth(), result); + return result.toString(); + } + + /** * 根据权限数据拼查询任务详情sql * @param groupDataAuth * @return @@ -1358,25 +1371,30 @@ public class WmsHqlPack { public static String packHqlWmsTaskDetail(Map> groupDataAuth) { StringBuffer result = new StringBuffer(); Set>> entries = groupDataAuth.entrySet(); - String warehouse = DataAuthEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue(); - String locate = DataAuthEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue(); - String zone = DataAuthEnumUtil.DATA_OBJ_TYPE.ZONE.getValue(); //拼sql entries.stream().filter(o->!Strings.isNullOrEmpty(o.getKey())).forEach(o->{ List value = o.getValue(); List vList = value.stream().map(x -> x.getDataObjValue()).collect(Collectors.toList()); String data = String.join(",", vList); - if(warehouse.equals(o.getKey())){ - // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(data,"destWhNo",result); - } - if(locate.equals(o.getKey())){ - // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(data,"destLocateNo",result); - } - if(zone.equals(o.getKey())){ - // 参数数组 [1,2,3] -> "1,2,3" - HqlPack.getInPack(data,"destZoneNo",result); + if (StringUtils.isNotBlank(data)) { + List mapList = JSONObject.parseArray(data, Map.class); + if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", o.getKey())) { + for (Map whNoItem : mapList) { + HqlPack.getInOrPackString(whNoItem.get("WH_CODE").toString(), "destWhNo", result); + } + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", o.getKey())) { + for (Map locateNoItem : mapList) { + HqlPack.getInOrPackString(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result); + } + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", o.getKey())) { + for (Map zoneNoItem : mapList) { + HqlPack.getInOrPackString(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result); + } + } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", o.getKey())) { + for (Map zoneNoItem : mapList) { + HqlPack.getInOrPackString(zoneNoItem.get("PART_NO").toString(), "partNo", result); + } + } } }); getStringBuilderPack(new WmsDataAuth(), result); @@ -1392,7 +1410,7 @@ public class WmsHqlPack { public static String packHqlAndIn(BaseBean bean,String columnName,List vals) { StringBuffer result = new StringBuffer(); String data = String.join(",", vals); - HqlPack.getInPack(data,columnName,result); + HqlPack.getInPackString(data,columnName,result); getStringBuilderPack(bean, result); return result.toString(); } From 9c08de7a7a2244525413ad703d350e5860be97de Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 11 Mar 2019 22:40:30 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 --- 1 file changed, 3 deletions(-) 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 f039f32..0404699 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 @@ -8,7 +8,6 @@ import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import com.alibaba.fastjson.JSONObject; import com.google.common.base.Strings; -import com.sun.org.apache.xerces.internal.xs.datatypes.ObjectList; import org.apache.commons.lang3.StringUtils; import java.util.List; @@ -16,8 +15,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import static com.alibaba.fastjson.JSON.parseArray; - /** * @Description : 仓库管理对象封装 * @Reference : From 86e96e8f7617eb9e2538abedb21f5047d9b2e895 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 12 Mar 2019 09:21:18 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=84=E7=90=86?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95=E6=8F=90?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java | 4 ++-- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java | 2 +- .../estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java | 1 - .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 9 ++++----- 6 files changed, 11 insertions(+), 10 deletions(-) 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 5d5d293..ff1b98b 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 @@ -58,11 +58,11 @@ public class WmsASNMasterDetails extends BaseBean { @Column(name = "ZDATE") @ApiParam("计划交货日期") - public String zDate; + public String planDate; @Column(name = "ZTIME") @ApiParam("计划交货时间") - public String zTime; + public String planTime; /** * 状态:N=正常,C=行取消,R=已收货 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index ab1f30c..9ab2ff2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -62,4 +62,7 @@ public class WmsCSOrderMaster extends BaseBean { @ApiParam(value = "盘点明细集") public List wmsCSOrderDetailsList; + @Column(name = "IS_TASK") + @ApiParam(value = "是否生产任务", example = "1") + public Integer isTask; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index 8d645ee..b1b7c0c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -57,7 +57,7 @@ public class WmsTaskInfo extends BaseBean { @Column(name = "TRANS_TYPE_CODE") @ApiParam("交易类型") - private String transTypeCode; + public String transTypeCode; @Column(name = "PRE_USE_TIME") @ApiParam(value = "预计作业时间(分钟)", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index a6766aa..5f5c023 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_TASK_SRC") -@Api("作业任务表") +@Api("作业任务数据来源表") public class WmsTaskSrc extends BaseBean { @Column(name = "OP_TYPE_CODE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java index c248080..5d44e77 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsTaskSrcRepository.java @@ -12,6 +12,5 @@ import org.springframework.stereotype.Repository; * @CreateDate : 2019-03-06 14:41 * @Modify: **/ -@Repository public interface WmsTaskSrcRepository extends BaseRepository { } 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 048fea8..5d7f5cc 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 @@ -9,7 +9,6 @@ import cn.estsh.i3plus.pojo.wms.bean.*; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Set; @@ -58,8 +57,8 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result); - HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "planTime", result); + HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "planDate", result); getStringBuilderPack(wmsPOMasterDetails, result); @@ -585,8 +584,8 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getZDate(), "zDate", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getZTime(), "zTime", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanDate(), "planDate", result); + HqlPack.getStringEqualPack(wmsASNMasterDetails.getPlanTime(), "planTime", result); HqlPack.getNumEqualPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result); HqlPack.getStringEqualPack(wmsASNMasterDetails.getPackAge(), "packAge", result); HqlPack.getNumEqualPack(wmsASNMasterDetails.getIsFree(), "isFree", result); From 238160a65f9e3248eccf0284688023e6768e632a Mon Sep 17 00:00:00 2001 From: Silliter Date: Tue, 12 Mar 2019 10:35:19 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E5=B1=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) 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 9e54499..760566e 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 @@ -1338,24 +1338,13 @@ public class WmsHqlPack { /** * 根据用户角色id列表查询数据权限信息 - * @param roleIds * @return */ - public static String packHqlWmsDataAuth(List roleIds) { - StringBuffer result = new StringBuffer(); - String data = String.join(",", roleIds); - HqlPack.getInPack(data,"roleCode",result); - getStringBuilderPack(new WmsDataAuth(), result); - return result.toString(); - } - - /** - * 根据用户角色id列表查询数据权限信息 - * @return - */ - public static String packHqlWmsDataAuth(WmsDataAuth dataAuth) { + public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List roleIds) { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(dataAuth.getDataObj() ,"dataObj", result); + String data = String.join(",", roleIds); + HqlPack.getInPackString(data, "roleCode", result); getStringBuilderPack(new WmsDataAuth(), result); return result.toString(); }