From dea366714e569f8550a528b77864d701c2824e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 28 Dec 2023 15:05:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=94=B6=E8=B4=A7=20bom=20?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B9=98=E4=BB=A5=E5=AD=90=E8=A1=A8=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProductreceiptRequestDetailDO.java | 2 +- .../ProductreceiptRequestDetailServiceImpl.java | 8 +++++--- .../ProductreceiptRequestMainServiceImpl.java | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java index 36a869cf..a1f2a3f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java @@ -134,7 +134,7 @@ public class ProductreceiptRequestDetailDO extends BaseDO { /** * 数量 */ - private Double qty; + private BigDecimal qty; /** * 计量单位 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java index 590c1d64..b7abf3a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java @@ -23,6 +23,7 @@ import com.win.module.wms.service.itempackaging.ItempackagingService; import com.win.module.wms.service.productionline.ProductionlineService; import com.win.module.wms.service.productionlineitem.ProductionlineitemService; import com.win.module.wms.service.workstation.WorkstationService; +import com.win.module.wms.util.JobUtils; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -58,7 +59,8 @@ public class ProductreceiptRequestDetailServiceImpl implements ProductreceiptReq private ProductreceiptRequestMainService productreceiptRequestMainService; @Resource private ProductreceiptRequestDetailMapper productreceiptRequestDetailMapper; - + @Resource + private JobUtils jobUtils; @Override public Long createProductreceiptRequestDetail(ProductreceiptRequestDetailCreateReqVO createReqVO) { // 插入 @@ -118,8 +120,8 @@ public class ProductreceiptRequestDetailServiceImpl implements ProductreceiptReq } // 校验 物品和bom关系 bomService.bomItemCodeAndVersionExist(detailDo.getItemCode(),detailDo.getBomVersion()); - // 校验 成品库与物品关系 TODO：需要上架策略完善后 打开注释 -// jobUtils.getItemCodeLocationCode(detailDo.getItemCode(), detailDo.getToLocationCode()); + // 校验 成品库与物品关系 + jobUtils.getItemCodeLocationCode(detailDo.getItemCode(), detailDo.getToLocationCode()); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java index e975099d..8904932a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java @@ -519,7 +519,7 @@ public class ProductreceiptRequestMainServiceImpl implements ProductreceiptReque backflushRequestDetailbDO.setItemCode(itemBom.get("itemCode")==null?"":itemBom.get("itemCode").toString()); backflushRequestDetailbDO.setMasterId(detailbDO.getId()); backflushRequestDetailbDO.setNumber(detailbDO.getNumber()); - backflushRequestDetailbDO.setQty(new BigDecimal(itemBom.get("qty").toString())); + backflushRequestDetailbDO.setQty(new BigDecimal(itemBom.get("qty").toString()).multiply(detailbDO.getQty())); backflushRequestDetailbDO.setUom(itemBom.get("uom")==null?"":itemBom.get("uom").toString()); // 赋值物品相关信息 ItembasicDO itembasicDO = itembasicService.selectItembasic(itemBom.get("itemCode")==null?"":itemBom.get("itemCode").toString());