From 88279f9b8bd2c69ee397dbb37189962882e31f1c Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 15 Apr 2020 19:16:11 +0800 Subject: [PATCH] =?UTF-8?q?sonar=20bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 9 ++-- .../estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java | 10 ++++ .../pojo/wms/bean/WmsTmsShippingExtDetail.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java | 27 +++++++++++ 4 files changed, 96 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 fb0ec0d..d12bf90 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 @@ -1283,8 +1283,8 @@ public class WmsEnumUtil { public enum CS_STRATEGY_TYPE { PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), - ZORE_STOCK(130, "零库存"); - + ZORE_STOCK(130, "零库存"), + MATERIAL_COVERAGE(140, "物料覆盖"); private int value; private String description; @@ -1328,7 +1328,8 @@ public class WmsEnumUtil { AJUST_INVENTORY(50, "库存调整盘点"), PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), - ZORE_STOCK(130, "零库存"); + ZORE_STOCK(130, "零库存"), + MATERIAL_COVERAGE(140, "物料覆盖"); private int value; private String description; @@ -6191,4 +6192,4 @@ public class WmsEnumUtil { return valueOf(val); } } -} \ No newline at end of file +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java index 3561345..a6845a4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCsStrategy.java @@ -100,4 +100,14 @@ public class WmsCsStrategy extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) @ApiParam(value = "备注") private String remake; + + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam(value = "已盘物料") + @Column(name="INVENTORY_MATERIAL") + private String inventoryMaterial; + + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) + @ApiParam(value = "已盘库位") + @Column(name="INVENTORY_LOCATION") + private String inventoryLocation; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java index c1013d5..bc5e86b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtDetail.java @@ -301,4 +301,58 @@ public class WmsTmsShippingExtDetail extends BaseBean { return orderMasterStatus == null ? 0 : this.orderMasterStatus.intValue(); } + public WmsTmsShippingExtDetail(WmsDocMovementDetails docMovementDetails,String moveNo) { + this.moveNo = moveNo; + this.partNo = docMovementDetails.getPartNo(); + this.partNameRdd = docMovementDetails.getPartNameRdd(); + this.item = docMovementDetails.getItem(); + this.qty =docMovementDetails.getQty(); + this.unit = docMovementDetails.getUnit(); + this.orderNo = docMovementDetails.getOrderNo(); + this.srcWhNo = docMovementDetails.getSrcWhNo(); + this.srcZoneNo = docMovementDetails.getSrcZoneNo(); + this.srcLocateNo = docMovementDetails.getSrcLocateNo(); + this.destWhNo = docMovementDetails.getDestWhNo(); + this.destZoneNo = docMovementDetails.getDestZoneNo(); + this.destLocateNo = docMovementDetails.getDestLocateNo(); + this.printQty = docMovementDetails.getPrintQty(); + this.planDate = docMovementDetails.getPlanDate(); + this.planTime = docMovementDetails.getPlanTime(); + this.srcNo = docMovementDetails.getSrcNo(); + this.itemStatus = docMovementDetails.getItemStatus(); + this.isFree = docMovementDetails.getIsFree(); + this.remark = docMovementDetails.getRemark(); + this.pickQty = docMovementDetails.getPickQty(); + this.outQty = docMovementDetails.getOutQty(); + this.recQty = docMovementDetails.getRecQty(); + this.moveQty = docMovementDetails.getMoveQty(); + this.taskGenerateQty = docMovementDetails.getTaskGenerateQty(); + this.srcAreaNo = docMovementDetails.getSrcAreaNo(); + this.destAreaNo = docMovementDetails.getDestAreaNo(); + this.lotNo = docMovementDetails.getLotNo(); + this.srcItem = docMovementDetails.getSrcItem(); + this.custOrderNo = docMovementDetails.getCustOrderNo(); + this.assignDateCode = docMovementDetails.getAssignDateCode(); + this.actualLot = docMovementDetails.getActualLot(); + this.actualQty = docMovementDetails.getActualQty(); + this.recommondLot = docMovementDetails.getRecommondLot(); + this.recommondLocateNo = docMovementDetails.getRecommondLocateNo(); + this.isSet = docMovementDetails.getIsSet(); + this.dateCode = docMovementDetails.getDateCode(); + this.inputMoveQty = docMovementDetails.getInputMoveQty(); + this.snp = docMovementDetails.getSnp(); + this.detailsSnCount = docMovementDetails.getDetailsSnCount(); + this.restQty = docMovementDetails.getRestQty(); + this.isTask = docMovementDetails.getIsTask(); + this.orderMasterStatus = docMovementDetails.getOrderMasterStatus(); + this.printStatus = docMovementDetails.getPrintStatus(); + this.priority = docMovementDetails.getPriority(); + this.sumQty = docMovementDetails.getSumQty(); + this.sumPickQty = docMovementDetails.getSumPickQty(); + this.executeStatus = docMovementDetails.getExecuteStatus(); + this.lockVersion = docMovementDetails.getLockVersion(); + this.moveType = docMovementDetails.getMoveType(); + this.busiType = docMovementDetails.getBusiType(); + this.isSn = docMovementDetails.getIsSn(); + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java index 8c415bd..5c40810 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTmsShippingExtSn.java @@ -145,4 +145,31 @@ public class WmsTmsShippingExtSn extends BaseBean { this.countBox = countBox; this.partNo = partNo; } + + public WmsTmsShippingExtSn(String moveNo,WmsDocMovementSn docMovementSn) { + this.moveNo = moveNo; + this.orderNo = docMovementSn.getOrderNo(); + this.item = docMovementSn.getItem(); + this.partNo = docMovementSn.getPartNo(); + this.partNameRdd = docMovementSn.getPartNameRdd(); + this.qty = docMovementSn.getQty(); + this.unit = docMovementSn.getUnit(); + this.snStatus = docMovementSn.getSnStatus(); + this.sn = docMovementSn.getSn(); + this.vendorNo = docMovementSn.getVendorNo(); + this.snType = docMovementSn.getSnType(); + this.isSet = docMovementSn.getIsSet(); + this.destLocateNo = docMovementSn.getDestLocateNo(); + this.srcLocateNo = docMovementSn.getSrcLocateNo(); + this.dateCode = docMovementSn.getDateCode(); + this.inputMoveQty = docMovementSn.getInputMoveQty(); + this.planDate = docMovementSn.getPlanDate(); + this.planTime = docMovementSn.getPlanTime(); + this.erpWhNo = docMovementSn.getErpWhNo(); + this.itemStatus = docMovementSn.getItemStatus(); + this.customerPartNo = docMovementSn.getCustomerPartNo(); + this.parentReturnPart = docMovementSn.getParentReturnPart(); + this.templateNo = docMovementSn.getTemplateNo(); + this.countBox = docMovementSn.getCountBox(); + } }