From 5abd5d3bb71bc6d62f8a217fe4439d5015414217 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Tue, 2 Apr 2024 14:38:01 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B929?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 17 ++++- .../com/op/wms/domain/WmsFpStorageNewsSn.java | 15 ++++ .../op/wms/service/IWmsProductPutService.java | 4 + .../impl/WmsProductPutServiceImpl.java | 74 ++++++++++++++++++- .../mapper/wms/WmsSellOutEmbryoMapper.xml | 2 +- 5 files changed, 108 insertions(+), 4 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index 6d018c52..3df730b7 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -347,8 +347,23 @@ public class WmsToWCSmissionController { public AjaxResult confirmFinishedProductTransferAndOutbound(@RequestBody WmsAllocationOutEmbryo wmsRuturnPutEmbryo) { return AjaxResult.success(wmsProductPutService.confirmFinishedProductTransferAndOutbound(wmsRuturnPutEmbryo)); } + /** + * 成品库内转储--托盘扫码 + * + */ + @PostMapping("/palletScanning") + public AjaxResult palletScanning(@RequestBody WmsFpStorageNewsSn wmsFpStorageNewsSn) { + return AjaxResult.success(wmsProductPutService.palletScanning(wmsFpStorageNewsSn)); + } - + /** + * 成品库内转储--托盘移库确认 + * + */ + @PostMapping("/palletTransferConfirmation") + public AjaxResult palletTransferConfirmation(@RequestBody WmsFpStorageNewsSn wmsFpStorageNewsSn) { + return AjaxResult.success(wmsProductPutService.palletTransferConfirmation(wmsFpStorageNewsSn)); + } /** * 手持白胚入库查询 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java index 58a5cf99..0a168482 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java @@ -41,6 +41,21 @@ public class WmsFpStorageNewsSn extends BaseEntity { @Excel(name = "库位编码") private String wlCode; + + /** + * 库位编码 + */ + @Excel(name = "目标库位编码") + private String towlCode; + + public String getTowlCode() { + return towlCode; + } + + public void setTowlCode(String towlCode) { + this.towlCode = towlCode; + } + /** * 入库单号 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java index d9161afc..a55262ab 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java @@ -122,4 +122,8 @@ public interface IWmsProductPutService { List selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo); String confirmFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo); + + WmsFpStorageNewsSn palletScanning(WmsFpStorageNewsSn wmsFpStorageNewsSn); + + String palletTransferConfirmation(WmsFpStorageNewsSn wmsFpStorageNewsSn); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index a217521e..6b1e50c3 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -231,7 +231,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsFpStorageNewsSn.setSn(wmsProductPut1.getSn()); wmsFpStorageNewsSn.setAmount(new BigDecimal(wmsProductPut1.getNumber())); wmsFpStorageNewsSn.setBatchNumber(wmsProductPut.getBatchNumber()); - wmsFpStorageNewsSn.setUserDefined2(formattedDate); + //wmsFpStorageNewsSn.setUserDefined2(formattedDate); wmsFpStorageNewsSn.setCreateBy(wmsProductPut.getCreateBy()); wmsFpStorageNewsSn.setCreateTime(new Date()); wmsFpStorageNewsSn.setActiveFlag("1"); @@ -850,7 +850,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsFpStorageNewsSn.setSn(wmsProductPut1.getSn()); wmsFpStorageNewsSn.setAmount(new BigDecimal(wmsProductPut1.getNumber())); //wmsFpStorageNewsSn.setBatchNumber(wmsProductPut.getBatchNumber()); - wmsFpStorageNewsSn.setUserDefined2(formattedDate); + // wmsFpStorageNewsSn.setUserDefined2(formattedDate); wmsFpStorageNewsSn.setCreateBy(wmsRuturnPutEmbryo.getCreateBy()); wmsFpStorageNewsSn.setCreateTime(new Date()); wmsFpStorageNewsSn.setActiveFlag("1"); @@ -945,4 +945,74 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } return result1; } + + @Override + public WmsFpStorageNewsSn palletScanning(WmsFpStorageNewsSn wmsFpStorageNewsSn) { + DynamicDataSourceContextHolder.push("ds_" + wmsFpStorageNewsSn.getFactoryCode()); + wmsFpStorageNewsSn.setActiveFlag("1"); + List wmsFpStorageNewsSnList= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + if (wmsFpStorageNewsSnList.size()>0){ + return wmsFpStorageNewsSnList.get(0); + } + return null; + } + + @Override + public String palletTransferConfirmation(WmsFpStorageNewsSn wmsFpStorageNewsSn) { + String result1="移库成功"; + DynamicDataSourceContextHolder.push("ds_" + wmsFpStorageNewsSn.getFactoryCode()); + String toWlCode=wmsFpStorageNewsSn.getTowlCode(); + WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(wmsFpStorageNewsSn.getStorageId()); + //减库存明细 + wmsFpStorageNewsSn1.setActiveFlag("0"); + wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSn(wmsFpStorageNewsSn1); + //减库存 + WmsFpStorageNews wmsFpStorageNews= wmsFpStorageNewsMapper.selectWmsFpStorageNewsByProductCodeAndWlCode(wmsFpStorageNewsSn.getProductCode(),wmsFpStorageNewsSn.getWlCode()); + BigDecimal amount = wmsFpStorageNews.getAmount(); + BigDecimal amountsub = amount.subtract(wmsFpStorageNewsSn1.getAmount()); + wmsFpStorageNews.setAmount(amountsub); + wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews); + //添加库存明细 + WmsFpStorageNewsSn wmsFpStorageNewsSn2 = new WmsFpStorageNewsSn(); + wmsFpStorageNewsSn2.setStorageId(IdUtils.fastSimpleUUID()); + wmsFpStorageNewsSn2.setFactoryCode(wmsFpStorageNewsSn.getFactoryCode()); + wmsFpStorageNewsSn2.setWhCode(wmsFpStorageNewsSn.getWhCode());//仓库编码 + wmsFpStorageNewsSn2.setWlCode(toWlCode); + wmsFpStorageNewsSn2.setProductCode(wmsFpStorageNewsSn.getProductCode()); + wmsFpStorageNewsSn2.setProductName(wmsFpStorageNewsSn.getProductName()); + wmsFpStorageNewsSn2.setSn(wmsFpStorageNewsSn.getSn()); + wmsFpStorageNewsSn2.setAmount(wmsFpStorageNewsSn.getAmount()); + //wmsFpStorageNewsSn.setBatchNumber(wmsProductPut.getBatchNumber()); + // wmsFpStorageNewsSn2.setUserDefined2(formattedDate); + wmsFpStorageNewsSn2.setCreateBy(wmsFpStorageNewsSn.getCreateBy()); + wmsFpStorageNewsSn2.setCreateTime(new Date()); + wmsFpStorageNewsSn2.setActiveFlag("1"); + wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn2); + //添加库存 + WmsFpStorageNews wmsFpStorageNews1 = new WmsFpStorageNews(); + + wmsFpStorageNews1.setWhCode(wmsFpStorageNewsSn.getWhCode());//仓库编码 + wmsFpStorageNews1.setWlCode(toWlCode); + wmsFpStorageNews1.setStorageType("成品"); + wmsFpStorageNews1.setProductCode(wmsFpStorageNewsSn.getProductCode()); + wmsFpStorageNews1.setProductName(wmsFpStorageNewsSn.getProductName()); + wmsFpStorageNews1.setFactoryCode(wmsFpStorageNewsSn.getFactoryCode()); + wmsFpStorageNews1.setActiveFlag("1"); + wmsFpStorageNews1.setUserDefined1(wmsFpStorageNews.getUserDefined1()); + List wmsFpStorageNewsList = wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews1); + wmsFpStorageNews1.setStorageId(IdUtils.fastSimpleUUID()); + wmsFpStorageNews1.setAmount(wmsFpStorageNewsSn.getAmount()); + wmsFpStorageNews1.setCreateBy(wmsFpStorageNewsSn.getCreateBy()); + wmsFpStorageNews1.setCreateTime(new Date()); + if (wmsFpStorageNewsList.size() > 0) { + WmsFpStorageNews wmsFpStorageNews2 = wmsFpStorageNewsList.get(0); + BigDecimal amount1 = wmsFpStorageNews2.getAmount(); + BigDecimal amountAdd = amount1.add(wmsFpStorageNews.getAmount()); + wmsFpStorageNews2.setAmount(amountAdd); + wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews2); + } else { + wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews); + } + return result1; + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml index a63ba04c..7bcb6193 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml @@ -376,7 +376,7 @@ unit_of_measure, lot_number, plan_quantity, - out_quantity, + COALESCE(out_quantity, 0) status, SAP_status, SAP_proof,