From a9e97d4e289e2d5660090e4cc62752adc9aff34c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Fri, 28 Aug 2020 18:01:06 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=902688=2008=20extPDA-=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=9B=B6=E4=BB=B6=E5=AF=B9=E5=BA=94=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E3=80=91=20=E3=80=902683=2008=20ext=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=92=8C=E6=98=BE=E7=A4=BA=E3=80=91=20=E3=80=902682?= =?UTF-8?q?=2008=20ext=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=A8=A1=E6=9D=BF=E9=80=89=E6=8B=A9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/PrintOrderDataModel.java | 52 ++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 30 +++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 72 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 25 ++++++++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 19 ++++++ 5 files changed, 198 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java index 8055c00..d904ed9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java @@ -105,6 +105,58 @@ public class PrintOrderDataModel implements Serializable { @Transient public String receiveDateTime; + @Transient + @ApiParam("类型名称") + public String busiTypeName; + + @Transient + @ApiParam("物料编号") + public String partNo; + + @ApiParam(value = "标题") + @Transient + public String title; + + @Transient + @ApiParam(value = "客户简称") + private String custName; + + @Transient + @ApiParam(value = "客户全称") + private String custDesc; + + @Transient + @ApiParam(value = "客户地址") + private String custAddr; + + @Transient + @ApiParam(value = "联系人") + private String custOwner; + + @Transient + @ApiParam(value = "电话号码") + private String custTel; + + @Transient + @ApiParam("业务类型") + public Integer busiType; + + @Transient + @ApiParam("源存储区代码") + public String srcZoneNo; + + @Transient + @ApiParam(value = "生产小组") + private String productionGroup; + + @Transient + @ApiParam(value="修改日期查询用，查询起始日期") + public String modifyDateTimeStart; + + @Transient + @ApiParam(value = "修改日期查询用，查询结束日期") + public String modifyDateTimeEnd; + public int getBusiDataType() { if (busiDataType != null) { return busiDataType.intValue(); 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 0e3179e..b0dd8a0 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 @@ -248,6 +248,9 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "替代物料编码") private String subPartNo; + @Transient + @ApiParam(value = "颜色") + private String color; @Transient @ApiParam(value = "替代物料名称") @@ -474,4 +477,31 @@ public class WmsDocMovementDetails extends BaseBean { this.createDatetime = createDatetime; } + public WmsDocMovementDetails (WmsDocMovementDetails wmsDocMovementDetails, String color) { + this.id = wmsDocMovementDetails.getId(); + this.orderNo = wmsDocMovementDetails.getOrderNo(); + this.partNo = wmsDocMovementDetails.getPartNo(); + this.qty = wmsDocMovementDetails.getQty(); + this.seqNo = wmsDocMovementDetails.getSeqNo(); + this.partNameRdd = wmsDocMovementDetails.getPartNameRdd(); + this.partSpec = wmsDocMovementDetails.getPartSpec(); + this.workOrderCode = wmsDocMovementDetails.getWorkOrderCode(); + this.productionGroup = wmsDocMovementDetails.getProductionGroup(); + this.item = wmsDocMovementDetails.getItem(); + this.planTime = wmsDocMovementDetails.getPlanTime(); + this.planDate = wmsDocMovementDetails.getPlanDate(); + this.unit = wmsDocMovementDetails.getUnit(); + this.custNo = wmsDocMovementDetails.getCustNo(); + this.srcZoneNo = wmsDocMovementDetails.getSrcZoneNo(); + this.srcWhNo = wmsDocMovementDetails.getSrcWhNo(); + this.srcLocateNo = wmsDocMovementDetails.getSrcLocateNo(); + this.destWhNo = wmsDocMovementDetails.getDestWhNo(); + this.destZoneNo = wmsDocMovementDetails.getDestZoneNo(); + this.destLocateNo = wmsDocMovementDetails.getDestLocateNo(); + this.srcAreaNo = wmsDocMovementDetails.getSrcAreaNo(); + this.destAreaNo = wmsDocMovementDetails.getDestAreaNo(); + this.destLocateNo = wmsDocMovementDetails.getDestLocateNo(); + this.organizeCode = wmsDocMovementDetails.getOrganizeCode(); + this.color = color; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 21658c2..9aaee96 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -277,6 +277,14 @@ public class WmsDocMovementMaster extends BaseBean { public String title; @Transient + @ApiParam(value = "生产小组") + private String productionGroup; + + @Transient + @ApiParam(value = "父位置号") + private String seqNo; + + @Transient @ApiParam("物料编号组") public String[] partNos; @@ -284,6 +292,42 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("工厂集合") private List organizeCodeList; + @Transient + @ApiParam("物料名称") + public String partNameRdd; + + @Transient + @ApiParam(value = "简称") + private String partSpec; + + @Transient + @ApiParam(value = "工单码") + private String workOrderCode; + + @Transient + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Transient + @ApiParam(value = "客户简称") + private String custName; + + @Transient + @ApiParam(value = "客户全称") + private String custDesc; + + @Transient + @ApiParam(value = "客户地址") + private String custAddr; + + @Transient + @ApiParam(value = "联系人") + private String custOwner; + + @Transient + @ApiParam(value = "电话号码") + private String custTel; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } @@ -299,4 +343,32 @@ public class WmsDocMovementMaster extends BaseBean { public WmsDocMovementMaster() { } + public WmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster,String seqNo,String assignSrcZoneNo,String partNo,String partNameRdd, + String partSpec,String workOrderCode,Double qty,String productionGroup,Integer busiType,String modifyDatetime, + String custName,String custDesc,String custAddr,String custOwner,String custTel) { + + this.id = wmsDocMovementMaster.getId(); + this.orderNo = wmsDocMovementMaster.getOrderNo(); + this.custNo = wmsDocMovementMaster.getCustNo(); + this.organizeCode = wmsDocMovementMaster.getOrganizeCode(); + this.orderStatus = wmsDocMovementMaster.getOrderStatus(); + this.vendorNo = wmsDocMovementMaster.getVendorNo(); + this.erpSrcNo = wmsDocMovementMaster.getErpSrcNo(); + this.seqNo = seqNo; + this.assignSrcZoneNo = assignSrcZoneNo; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.partSpec = partSpec; + this.workOrderCode = workOrderCode; + this.qty = qty; + this.productionGroup = productionGroup; + this.busiType = busiType; + this.modifyDatetime = modifyDatetime; +// this.color = color; + this.custName = custName; + this.custDesc = custDesc; + this.custAddr = custAddr; + this.custOwner = custOwner; + this.custTel = custTel; + } } 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 1645a74..143f6d8 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 @@ -180,6 +180,10 @@ public class WmsMoveSn extends BaseBean { public String serialSn; @Transient + @ApiParam("客户编号") + public String custNo; + + @Transient @ApiParam("业务类型编码") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") private Integer busiTypeCode; @@ -376,4 +380,25 @@ public class WmsMoveSn extends BaseBean { this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; } + + public WmsMoveSn(String partNo, String partNameRdd,String sn,String vendorNo,String custNo,String srcLocateNo,String destLocateNo,String srcZoneNo, + Double srcQty,Double destQty,String orderNo,String srcWhNo, Integer srcQcStatus ,Integer descQcStatus, + Integer srcSnStatus,Integer destSnStatus ) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.sn = sn; + this.vendorNo = vendorNo; + this.custNo = custNo; + this.srcLocateNo = srcLocateNo; + this.destLocateNo = destLocateNo; + this.srcZoneNo = srcZoneNo; + this.srcQty = srcQty; + this.destQty = destQty; + this.orderNo = orderNo; + this.srcWhNo = srcWhNo; + this.srcQcStatus = srcQcStatus; + this.descQcStatus = descQcStatus; + this.srcSnStatus = srcSnStatus; + this.destSnStatus = destSnStatus;; + } } 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 3a2d468..fd95d7f 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 @@ -3481,4 +3481,23 @@ public class WmsHqlPack { return result; } + + /** + * 字典查询 + * + * @param wmsEnum + * @return + */ + public static DdlPackBean packHqlWmsEnum(WmsEnum wmsEnum) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(wmsEnum.getOrganizeCode(), "organizeCode", result); + DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumType(), "enumType", result); + DdlPreparedPack.getStringEqualPack(wmsEnum.getEnumValue(), "enumValue", result); + + getStringBuilderPack(wmsEnum, result); + + return result; + } }