diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 5a95b6f..752316c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -430,7 +430,8 @@ public class ImppEnumUtil { MAIL(1,"邮件","邮件"), LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"); + SWEB_NOTICE(3,"SWEB通知","SWEB通知"), + SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); private int value; private String name; @@ -1092,7 +1093,8 @@ public class ImppEnumUtil { public enum FILE_ATTACH_SOURCE { MAIL(1,"邮件","邮件"), LETTER(2,"站内信","站内信"), - SWEB_NOTICE(3,"SWEB通知","SWEB通知"); + SWEB_NOTICE(3,"SWEB通知","SWEB通知"), + SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告"); private int value; private String name; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java index 4b2e9fc..e55fa30 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SwebEnumUtil.java @@ -259,4 +259,209 @@ public class SwebEnumUtil { return tmp; } } + + /** + * 用户消息类型 + * 1.NOTICE：通知 + * 2.STATION_LETTER：站内信 + * 3.SWEB_NOTICE：SWEB通知 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MESSAGE_TYPE { + + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); + + private int value; + private String name; + private String description; + + MESSAGE_TYPE() { + } + + MESSAGE_TYPE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(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 String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 附件来源 + * 1.NOTICE：通知 + * 2.STATION_LETTER：站内信 + * 3.SWEB_NOTICE：SWEB通知 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FILE_ATTACH_SOURCE { + MAIL(1, "邮件", "邮件"), + LETTER(2, "站内信", "站内信"), + SWEB_NOTICE(3, "SWEB通知", "SWEB通知"), + SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告"); + + private int value; + private String name; + private String description; + + FILE_ATTACH_SOURCE() { + } + + FILE_ATTACH_SOURCE(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(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 String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 前端系统平台 + * IMPP_FE：impp系统 + * SWEB_FE：sweb系统 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FE_PLATFORM { + IMPP_FE("IMPP_FE", "IMPP_FE", "impp系统"), + SWEB_FE("SWEB_FE", "SWEB_FE", "sweb系统"); + + private String value; + private String name; + private String description; + + FE_PLATFORM() { + } + + FE_PLATFORM(String value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDescription() { + return description; + } + + public static String valueOfCode(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].name; + } + } + return tmp; + } + + public static String valueOfDescription(String 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 String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 dd4ba2e..9b30cff 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 @@ -139,17 +139,19 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MASTER_ORDER_STATUS { - CREATE(10, "新建"), - RECEIPT(20, "处理中"), - RECEIPT_FINISH(30, "已完成"), - CLOSED(40, "已关闭"), - CANCELLED(50, "已取消"); + CREATE(10, "CREATE","新建"), + RECEIPT(20, "RECEIPT","处理中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH","已完成"), + CLOSED(40, "CLOSED","已关闭"), + CANCELLED(50, "CANCELLED","已取消"); private int value; + private String code; private String description; - MASTER_ORDER_STATUS(int value, String description) { + MASTER_ORDER_STATUS(int value,String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -157,6 +159,10 @@ public class WmsEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } @@ -586,11 +592,11 @@ public class WmsEnumUtil { ASN("ASN", "ASN"), PO("PO", "PO"), SO("SO", "SO"), - MOVE("MOVE", "MOVE"), - IN_STOCK("IN_STOCK", "IN_STOCK"), - SHIPPING("SHIPPING", "SHIPPING"), - QC("QC", "QC"), - CS("CS", "CS"); + MOVE("MOVE", "移库单"), + IN_STOCK("IN_STOCK", "入库单"), + SHIPPING("SHIPPING", "发运单"), + QC("QC", "质检"), + CS("CS", "盘点"); private String value; private String description; @@ -619,6 +625,16 @@ public class WmsEnumUtil { } return null; } + + public static String getDes(String 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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 6ae5e60..d4eeaff 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -69,11 +69,11 @@ public class MesPart extends BaseBean { @ApiParam("默认工作中心") private String defaultWorkCenter; - @Column(name="PRODUCE_CATEGORY") - @ApiParam("产品类型") - private String produceCategory; + @Column(name="PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; @Transient - @ApiParam("分类名称") - private String categoryName; + @ApiParam("产品类型名称") + private String produceCategoryName; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index f560afe..c62ae4a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -115,10 +115,13 @@ public class MesPlanOrder extends BaseBean { @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") public String endTimeEnd; + @Transient public List planTypeEnum; + @Transient public List planOrderStatusEnum; + @Transient public List getPlanTypeEnum() { return Arrays.asList(MesEnumUtil.PLAN_ORDER_TYPE.values()); } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java new file mode 100644 index 0000000..538b63f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +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; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:25 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PRODUCE_CATEGORY") +@Api("系统业务动作") +public class MesProduceCategory extends BaseBean { + + @Column(name="PRODUCE_CTGY_CODE") + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @Column(name="PRODUCE_CTGY_NAME") + @ApiParam("产品类型名称") + private String produceCategoryName; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCategoryRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCategoryRepository.java new file mode 100644 index 0000000..943e7f1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceCategoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProduceCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-26-10:28 + * @Modify: + **/ +@Repository +public interface MesProduceCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 53395a7..632dcd4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -111,8 +111,8 @@ public class MesHqlPack { } /** - * 物料信息查询条件封装 - * @param mesPart + * 生产工单查询条件封装 + * @param mesWorkOrder * @return */ public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java new file mode 100644 index 0000000..89047cc --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsOrderMasterModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 单据Model + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2019-03-07 19:18 + * @Modify: + **/ +@Data +@Api("单据Model") +public class WmsOrderMasterModel extends BaseBean { + @ApiParam("状态") + public Integer orderStatus; + + @ApiParam("不同状态的小计") + public Long statusQty; + + public WmsOrderMasterModel() { + } + public WmsOrderMasterModel(Integer orderStatus, Long statusQty) { + this.orderStatus = orderStatus; + this.statusQty =statusQty; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index 1359294..0e72b17 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -23,8 +23,8 @@ public class WmsTaskInfoModel implements Serializable { /** * 状态:1=创建,10=待处理,20=已处理 */ - @ApiParam(value = "任务状态", example = "1") - public Integer taskStatus; + @ApiParam(value = "任务状态") + public String taskStatus; @ApiParam("作业类型名称") public String opTypeName; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 5257aed..beb96bf 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -100,6 +100,14 @@ public class SysMessage extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long readCount; + public long getReadCountVal(){ + if(readCount == null){ + return 0; + } else { + return readCount.longValue(); + } + } + public SysMessage() { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java deleted file mode 100644 index 37c5121..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.bean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; - -/** - * @Description : 测试类 - * @Reference : - * @Author : yunhao - * @CreateDate : 2019-02-24 16:21 - * @Modify: - **/ -public class TestInfo extends BaseBean { - - - /** - * 执行耗时 - */ - private long executeTime; - - public TestInfo(){ - - } - - public TestInfo(long executeTime){ - this.executeTime = System.currentTimeMillis() - executeTime; - } -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 34ff73c..c729338 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -613,6 +613,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageSoftType(),"messageSoftType",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result); HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result); HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result); diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java index 8076ebd..3594480 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java @@ -31,4 +31,9 @@ public class SwebLoginUserModel implements Serializable { @ApiParam(value = "ip地址") private String ip; + + public SwebLoginUserModel(Long id, String userName) { + this.id = id; + this.userName = userName; + } } 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 index dfa8162..2996182 100644 --- 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 @@ -63,6 +63,14 @@ public class SwebHqlPack { return buildHql(swebPackage, result); } + public static DdlPackBean getConfigWhereHql(SwebConfig swebConfig) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(swebConfig.getConfigCode(), "configCode", result); + DdlPreparedPack.getStringEqualPack(swebConfig.getConfigValue(), "configValue", result); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"modifyDatetime"}, result); + return buildHql(swebConfig, result); + } + public static DdlPackBean getPurchaseOrderDetailsWhereHql(SwebPOForPubListEnterModel model) { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(model.getOrderNo(), "orderNo", result); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index d1aee88..c61f2c7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -38,7 +38,7 @@ public class WmsASNMaster extends BaseBean { @ApiParam("单据类型") public String asnType; - @Column(name = "MASTER_ORDER_STATUS") + @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") public Integer asnStatus; 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 15a11c4..dab72a9 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 @@ -174,6 +174,10 @@ public class WmsStockSn extends BaseBean { @Transient public Boolean isSet = false; + @ApiParam(value = "加减库容标志") + @Transient + public Boolean isAdd; + public WmsStockSn(){} public WmsStockSn(String partNo){ diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java deleted file mode 100644 index 6107123..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderMasterModel.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.modelbean; - -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; - -import javax.persistence.Column; - -/** - * @Description : 单据Model - * @Reference : - * @Author : dragon.xu - * @CreateDate : 2019-03-07 19:18 - * @Modify: - **/ -@Data -@Api("单据Model") -public class WmsOrderMasterModel extends BaseBean { - @Column(name = "ORDER_NO") - @ApiParam("订单号") - public String orderNo; -} 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 5cd3bf9..d92af1f 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 @@ -79,19 +79,19 @@ public class WmsHqlPack { * @param wmsPOMasterDetails * @return */ - public static String packHqlWmsPOMasterDetails(WmsPOMasterDetails wmsPOMasterDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPOMasterDetails(WmsPOMasterDetails wmsPOMasterDetails) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); - HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); - HqlPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanTime(), "planTime", result); + DdlPreparedPack.getStringRightLikerPack(wmsPOMasterDetails.getPlanDate(), "planDate", result); getStringBuilderPack(wmsPOMasterDetails, result); - return result.toString(); + return result; } /** @@ -155,20 +155,20 @@ public class WmsHqlPack { * @param wmsPOMaster * @return */ - public static String packHqlWmsPOMaster(WmsPOMaster wmsPOMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPOMaster(WmsPOMaster wmsPOMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); - HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); - HqlPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); + DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); getStringBuilderPack(wmsPOMaster, result); - return result.toString(); + return result; } /** @@ -177,22 +177,22 @@ public class WmsHqlPack { * @param wmsPOMaster * @return */ - public static String packHqlWmsPOMasterPart(WmsPOMaster wmsPOMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPOMasterPart(WmsPOMaster wmsPOMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", + DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "", WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""), "poStatus", 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); - HqlPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); getStringBuilderPack(wmsPOMaster, result); - return result.toString(); + return result; } /** @@ -241,6 +241,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsPart.getPartName(), "partName", result); HqlPack.getStringLikerPack(wmsPart.getPartSpec(), "partSpec", result); HqlPack.getStringLikerPack(wmsPart.getPartType(), "partType", result); + HqlPack.getNumEqualPack(wmsPart.getSnControl(), "snControl", result); getStringBuilderPack(wmsPart, result); @@ -253,22 +254,22 @@ public class WmsHqlPack { * @param wmsIbCheckPlan * @return */ - public static String packHqlWmsIbCheckPlan(WmsIbCheckPlan wmsIbCheckPlan) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsIbCheckPlan(WmsIbCheckPlan wmsIbCheckPlan) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsIbCheckPlan, result); if (wmsIbCheckPlan.getStartDateStart() != null || wmsIbCheckPlan.getStartDateEnd() != null) { - HqlPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); + DdlPreparedPack.timeBuilder(wmsIbCheckPlan.getStartDateStart(), wmsIbCheckPlan.getStartDateEnd(), "startDate", result, false); } if (wmsIbCheckPlan.getEndDateStart() != null || wmsIbCheckPlan.getEndDateEnd() != null) { - HqlPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); + DdlPreparedPack.timeBuilder(wmsIbCheckPlan.getEndDateStart(), wmsIbCheckPlan.getEndDateEnd(), "endDate", result, false); } - return result.toString(); + return result; } /** @@ -316,20 +317,20 @@ public class WmsHqlPack { * @param basVendor * @return */ - public static String packHqlBasVendor(BasVendor basVendor) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBasVendor(BasVendor basVendor) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result); - HqlPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result); - HqlPack.getStringLikerPack(basVendor.getVendorOwner(), "vendorOwner", result); - HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); - HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); - HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); - HqlPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorName(), "vendorName", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorOwner(), "vendorOwner", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); + DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); + DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result); getStringBuilderPack(basVendor, result); - return result.toString(); + return result; } /** @@ -356,16 +357,16 @@ public class WmsHqlPack { * @param wareHouse * @return */ - public static String packHqlWareHouse(WareHouse wareHouse) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWareHouse(WareHouse wareHouse) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(wareHouse.getAddress(), "address", result); - HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); - HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(wareHouse.getAddress(), "address", result); + DdlPreparedPack.getStringLikerPack(wareHouse.getCode(), "code", result); + DdlPreparedPack.getStringLikerPack(wareHouse.getName(), "name", result); getStringBuilderPack(wareHouse, result); - return result.toString(); + return result; } /** @@ -374,16 +375,16 @@ public class WmsHqlPack { * @param wareHouse * @return */ - public static String packHqlWareHouseUnique(WareHouse wareHouse) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWareHouseUnique(WareHouse wareHouse) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wareHouse.getName(), "name", result); - HqlPack.getStringEqualPack(wareHouse.getCode(), "code", result); - HqlPack.getNumNOEqualPack(wareHouse.getId(), "id", result); + DdlPreparedPack.getStringEqualPack(wareHouse.getName(), "name", result); + DdlPreparedPack.getStringEqualPack(wareHouse.getCode(), "code", result); + DdlPreparedPack.getNumNOEqualPack(wareHouse.getId(), "id", result); getStringBuilderPack(wareHouse, result); - return result.toString(); + return result; } /** @@ -392,21 +393,21 @@ public class WmsHqlPack { * @param wmsZones * @return */ - public static String packHqlWmsZones(WmsZones wmsZones) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsZones(WmsZones wmsZones) { + DdlPackBean result = new DdlPackBean(); //仓库代码 - HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); //库存地代码 - HqlPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); + DdlPreparedPack.getStringLikerPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 - HqlPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringLikerPack(wmsZones.getZoneNo(), "zoneNo", result); //存储区名称 - HqlPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); + DdlPreparedPack.getStringLikerPack(wmsZones.getZoneName(), "zoneName", result); getStringBuilderPack(wmsZones, result); - return result.toString(); + return result; } /** @@ -438,12 +439,12 @@ public class WmsHqlPack { * @param wmsLocate * @return */ - public static String packHqlWmsLocatesByType(WmsLocate wmsLocate) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsLocatesByType(WmsLocate wmsLocate) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); + DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result); getStringBuilderPack(wmsLocate, result); - return result.toString(); + return result; } /** @@ -452,17 +453,17 @@ public class WmsHqlPack { * @param wmsLocatePart * @return */ - public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsLocatePart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsLocatePart, result); - return result.toString(); + return result; } /** @@ -471,17 +472,17 @@ public class WmsHqlPack { * @param basVendor * @return */ - public static String packHqlBasVendorUnique(BasVendor basVendor) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) { + DdlPackBean result =new DdlPackBean(); - HqlPack.getNumNOEqualPack(basVendor.getId(), "id", result); - HqlPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); - HqlPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); + DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result); + DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(basVendor.getVendorName(), "vendorName", result); + DdlPreparedPack.getStringEqualPack(basVendor.getVendorDesc(), "vendorDesc", result); getStringBuilderPack(basVendor, result); - return result.toString(); + return result; } public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { @@ -533,19 +534,19 @@ public class WmsHqlPack { * @param basCustomer * @return */ - public static String packHqlBasCustomer(BasCustomer basCustomer) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlBasCustomer(BasCustomer basCustomer) { + DdlPackBean result = new DdlPackBean(); //客户编号 - HqlPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); //客户简称 - HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); + DdlPreparedPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); //客户全称 - HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); + DdlPreparedPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); getStringBuilderPack(basCustomer, result); - return result.toString(); + return result; } /** @@ -554,19 +555,19 @@ public class WmsHqlPack { * @param wmsShippingFlag * @return */ - public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { + DdlPackBean result = new DdlPackBean(); //供应商编号 - HqlPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result); + DdlPreparedPack.getStringEqualPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); + DdlPreparedPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); //供应商全称 - HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); + DdlPreparedPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); getStringBuilderPack(wmsShippingFlag, result); - return result.toString(); + return result; } /** @@ -575,20 +576,20 @@ public class WmsHqlPack { * @param wmsASNMaster * @return */ - public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) { + DdlPackBean result =new DdlPackBean(); - HqlPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); - HqlPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result); - HqlPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result); - HqlPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); - HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result); + DdlPreparedPack.getNumEqualPack(wmsASNMaster.getAsnStatus(), "asnStatus", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result); + DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); getStringBuilderPack(wmsASNMaster, result); - return result.toString(); + return result; } /** @@ -624,49 +625,49 @@ public class WmsHqlPack { * @param wmsCheckFactRecord * @return */ - public static String packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) { + DdlPackBean result =new DdlPackBean(); //采购单号 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result); //ASN单号 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getAsnNo(), "asnNo", result); //条码 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getSn(), "getSn", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getSn(), "getSn", result); //物料编码 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPartNo(), "partNo", result); //供应商编号 - HqlPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); + DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getVendorNo(), "vendorNo", result); getStringBuilderPack(wmsCheckFactRecord, result); - return result.toString(); + return result; } - public static String packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { - StringBuffer result = new StringBuffer(); - - HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); - HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", 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); - HqlPack.getStringLikerPack(wmsASNMasterDetails.getDock(), "dock", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getErpAreaNo(), "erpAreaNo", result); - HqlPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); + public static DdlPackBean packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) { + DdlPackBean result =new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPoItem(), "poItem", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getUnit(), "unit", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPlanDate(), "planDate", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPlanTime(), "planTime", result); + DdlPreparedPack.getNumEqualPack(wmsASNMasterDetails.getItemStatus(), "itemStatus", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPackAge(), "packAge", result); + DdlPreparedPack.getNumEqualPack(wmsASNMasterDetails.getIsFree(), "isFree", result); + DdlPreparedPack.getStringLikerPack(wmsASNMasterDetails.getDock(), "dock", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getSnOneBarCode(), "snOneBarCode", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getSnTwoBarCode(), "snTwoBarCode", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getGroupNo(), "groupNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getErpAreaNo(), "erpAreaNo", result); + DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getVendorLotNo(), "vendorLotNo", result); getStringBuilderPack(wmsASNMasterDetails, result); - return result.toString(); + return result; } /** @@ -675,29 +676,29 @@ public class WmsHqlPack { * @param wmsFGInStock * @return */ - public static String packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsFGInStock(WmsFGInStock wmsFGInStock) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsFGInStock.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getWoNo(), "woNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getPartNo(), "partNo", result); - HqlPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(), "partNameRdd", result); - HqlPack.getNumEqualPackDouble(wmsFGInStock.getQty(), "qty", result); - HqlPack.getStringEqualPack(wmsFGInStock.getUnit(), "unit", result); - HqlPack.getStringEqualPack(wmsFGInStock.getSn(), "sn", result); - HqlPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result); - HqlPack.getStringLikerPack(wmsFGInStock.getRemark(), "remark", result); - HqlPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result); - HqlPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result); - HqlPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result); - HqlPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); - HqlPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWoNo(), "woNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getPartNo(), "partNo", result); + DdlPreparedPack.getStringLikerPack(wmsFGInStock.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getNumEqualPack(wmsFGInStock.getQty(), "qty", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getUnit(), "unit", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getSn(), "sn", result); + DdlPreparedPack.getNumEqualPack(wmsFGInStock.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getStringLikerPack(wmsFGInStock.getRemark(), "remark", result); + DdlPreparedPack.getStringLikerPack(wmsFGInStock.getSrc(), "src", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getErpAreaNo(), "erpWhno", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getLineNo(), "lineNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); + DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); getStringBuilderPack(wmsFGInStock, result); - return result.toString(); + return result; } /** @@ -706,19 +707,19 @@ public class WmsHqlPack { * @param wmsTaskInfo * @return */ - public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); - HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); + DdlPreparedPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result); + DdlPreparedPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); getStringBuilderPack(wmsTaskInfo, result); - return result.toString(); + return result; } /** @@ -750,15 +751,15 @@ public class WmsHqlPack { * @param wmsCSLocate * @return */ - public static String packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSLocate(WmsCSLocate wmsCSLocate) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSLocate.getLocateNo(), ";locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSLocate.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSLocate.getLocateNo(), ";locateNo", result); getStringBuilderPack(wmsCSLocate, result); - return result.toString(); + return result; } /** @@ -767,17 +768,17 @@ public class WmsHqlPack { * @param wmsCSPart * @return */ - public static String packHqlWmsCSPart(WmsCSPart wmsCSPart) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSPart(WmsCSPart wmsCSPart) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); - HqlPack.getNumEqualPack(wmsCSPart.getIsAdjust(), "isAdjust", result); - HqlPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringEqualPack(wmsCSPart.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSPart.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(wmsCSPart.getIsAdjust(), "isAdjust", result); + DdlPreparedPack.getStringLikerPack(wmsCSPart.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsCSPart, result); - return result.toString(); + return result; } /** @@ -786,15 +787,15 @@ public class WmsHqlPack { * @param wmsCSZone * @return */ - public static String packHqlWmsCSZone(WmsCSZone wmsCSZone) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSZone(WmsCSZone wmsCSZone) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSZone.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSZone.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSZone.getZoneNo(), "zoneNo", result); getStringBuilderPack(wmsCSZone, result); - return result.toString(); + return result; } /** @@ -873,19 +874,19 @@ public class WmsHqlPack { * @param wmsStockQuan * @return */ - public static String packWmsStockQuan(WmsStockQuan wmsStockQuan) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsStockQuan(WmsStockQuan wmsStockQuan) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getWhNo(), "whNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result); getStringBuilderPack(wmsStockQuan, result); - return result.toString(); + return result; } /** @@ -950,16 +951,16 @@ public class WmsHqlPack { * @param wmsMoveMaster * @return */ - public static String packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) { + DdlPackBean result =new DdlPackBean(); - HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result); + DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); getStringBuilderPack(wmsMoveMaster, result); - return result.toString(); + return result; } /** @@ -968,15 +969,15 @@ public class WmsHqlPack { * @param wmsMoveMaster * @return */ - public static String packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsMoveMaster(WmsMoveMaster wmsMoveMaster) { + DdlPackBean result = new DdlPackBean(); - HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); - HqlPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); getStringBuilderPack(wmsMoveMaster, result); - return result.toString(); + return result; } /** @@ -987,7 +988,6 @@ public class WmsHqlPack { */ public static DdlPackBean packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) { DdlPackBean packBean = new DdlPackBean(); -// StringBuffer result = new StringBuffer(); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", packBean); @@ -1019,9 +1019,12 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result); HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result); HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result); + HqlPack.getStringEqualPack(wmsMoveSn.getDestLocateNo(), "destLocateNo", result); + HqlPack.getStringEqualPack(wmsMoveSn.getSrcLocateNo(), "srcLocateNo", result); getStringBuilderPack(wmsMoveSn, result); return result.toString(); @@ -1153,18 +1156,18 @@ public class WmsHqlPack { * @param wmsCSOrderMaster * @return */ - public static String packHqlWmsCSOrderMasters(WmsCSOrderMaster wmsCSOrderMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSOrderMasters(WmsCSOrderMaster wmsCSOrderMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); - HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); - HqlPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); - HqlPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result); + DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result); getStringBuilderPack(wmsCSOrderMaster, result); - return result.toString(); + return result; } /** @@ -1173,15 +1176,15 @@ public class WmsHqlPack { * @param wmsCSOrderDetails * @return */ - public static String packHqlWmsCSOrderDetails(WmsCSOrderDetails wmsCSOrderDetails) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSOrderDetails(WmsCSOrderDetails wmsCSOrderDetails) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsCSOrderDetails, result); - return result.toString(); + return result; } /** @@ -1190,16 +1193,16 @@ public class WmsHqlPack { * @param wmsCSFactTrans * @return */ - public static String packHqlWmsCSFactTrans(WmsCSFactTrans wmsCSFactTrans) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSFactTrans(WmsCSFactTrans wmsCSFactTrans) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result); getStringBuilderPack(wmsCSFactTrans, result); - return result.toString(); + return result; } /** @@ -1352,17 +1355,17 @@ public class WmsHqlPack { * @param wmsPoSn * @return */ - public static String packHqlWmsPoSn(WmsPoSn wmsPoSn) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsPoSn(WmsPoSn wmsPoSn) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); - HqlPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getOrderNo(), "orderNo", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNo(), "partNo", result); + DdlPreparedPack.getStringEqualPack(wmsPoSn.getPartNameRdd(), "partNameRdd", result); getStringBuilderPack(wmsPoSn, result); - return result.toString(); + return result; } /** @@ -1429,7 +1432,7 @@ public class WmsHqlPack { public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) { StringBuffer result = new StringBuffer(); HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result); - getStringBuilderPack(wmsStockSn, result); + HqlPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result); HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result); return result.toString(); } @@ -1514,12 +1517,12 @@ public class WmsHqlPack { * 给定字段动态in sql * * @param columnName - * @param orderNo + * @param orderList * @return */ - public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , String orderNo) { + public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , List orderList) { DdlPackBean packBean = new DdlPackBean(); - DdlPreparedPack.getInPack(orderNo, columnName, packBean); + DdlPreparedPack.getInPackList(orderList, columnName, packBean); DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean); DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean); @@ -1667,17 +1670,17 @@ public class WmsHqlPack { * @param wmsCSOrderMaster * @return */ - public static String packHqlWmsCSOrderMasterPart(WmsCSOrderMaster wmsCSOrderMaster) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlWmsCSOrderMasterPart(WmsCSOrderMaster wmsCSOrderMaster) { + DdlPackBean result = new DdlPackBean(); //查询参数封装 - HqlPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "", + DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "", WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue() + ""), "orderStatus", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); - HqlPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result); + DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result); getStringBuilderPack(wmsCSOrderMaster, result); - return result.toString(); + return result; } }