From 5e11d5378303fad0bec57e357fccf0077aee1482 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 15 Mar 2024 14:30:55 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B914?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 38 +++++++++++++ .../op/wms/domain/WmsProductPutTrayCode.java | 14 +++++ .../op/wms/service/IWmsProductPutService.java | 19 +++++-- .../impl/WmsProductPutServiceImpl.java | 54 +++++++++++++++++++ 4 files changed, 121 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 3889c0da..1ca666da 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 @@ -262,6 +262,44 @@ public class WmsToWCSmissionController { public AjaxResult selectSnCorrelationBarcode(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) { return AjaxResult.success(wmsProductPutService.selectSnCorrelationBarcode(wmsProductPutTrayCode)); } + + + /** + * 成品销售出库--提单查询接口 + * + */ + @PostMapping("/selectFinishedProductSales") + public AjaxResult selectFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) { + return AjaxResult.success(wmsProductPutService.selectFinishedProductSales(wmsSellOutEmbryo)); + } + + + /** + * 成品销售出库--确认接口 + * + */ + @PostMapping("/confirmFinishedProductSales") + public AjaxResult confirmFinishedProductSales(@RequestBody WmsSellOutEmbryo wmsSellOutEmbryo) { + return AjaxResult.success(wmsProductPutService.confirmFinishedProductSales(wmsSellOutEmbryo)); + } + + /** + * 成品销售出库----整托扫码 + * + */ + @PostMapping("/ScanCodeWholePallet") + public AjaxResult ScanCodeWholePallet(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) { + return AjaxResult.success(wmsProductPutService.ScanCodeWholePallet(wmsProductPutTrayCode)); + } + /** + * 成品销售出库----单箱扫码 + * + */ + @PostMapping("/ScanCodeSingleBox") + public AjaxResult ScanCodeSingleBox(@RequestBody WmsProductPutTrayCode wmsProductPutTrayCode) { + return AjaxResult.success(wmsProductPutService.ScanCodeSingleBox(wmsProductPutTrayCode)); + } + /** * 手持白胚入库查询 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java index 546f78ba..88e9ed32 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsProductPutTrayCode.java @@ -32,6 +32,20 @@ public class WmsProductPutTrayCode extends BaseEntity { @Excel(name = "箱码") private String barcode; + /** + * 库位 + */ + @Excel(name = "库位") + private String wlCode; + + public String getWlCode() { + return wlCode; + } + + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + /** * 数量 */ 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 fcb99546..d760e8d1 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 @@ -4,10 +4,7 @@ import java.text.ParseException; import java.util.List; import com.op.system.api.domain.wms.wmsReportWork; -import com.op.wms.domain.ProOrderWorkorder; -import com.op.wms.domain.WmsOdsWhiteEmbryoIn; -import com.op.wms.domain.WmsProductPut; -import com.op.wms.domain.WmsProductPutTrayCode; +import com.op.wms.domain.*; /** * 成品生产入库Service接口 @@ -89,4 +86,18 @@ public interface IWmsProductPutService { String addSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode); String deletSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode); + + List selectFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo); + + String confirmFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo); + /** + * 成品销售出库----整托扫码 + * + */ + List ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode); + /** + * 成品销售出库----单箱扫码 + * + */ + WmsProductPutTrayCode ScanCodeSingleBox(WmsProductPutTrayCode wmsProductPutTrayCode); } 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 eb94d232..92f2f895 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 @@ -669,4 +669,58 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { return result; } + @Override + public List selectFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) { + return null; + } + + @Override + public String confirmFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) { + return null; + } + + @Override + public List ScanCodeWholePallet(WmsProductPutTrayCode wmsProductPutTrayCode) { + DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode()); + wmsProductPutTrayCode.setRelatStatus("1"); + List wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode);//sn + WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); + wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn()); + wmsFpStorageNewsSn.setActiveFlag("1"); + List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + if (wmsFpStorageNewsSns.size()>0){ + WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0); + for (WmsProductPutTrayCode wmsProductPutTrayCode1: + wmsProductPutTrayCodeList) { + wmsProductPutTrayCode1.setWlCode(wmsFpStorageNewsSn1.getWlCode()); + } + } + + return wmsProductPutTrayCodeList; + } + + @Override + public WmsProductPutTrayCode ScanCodeSingleBox(WmsProductPutTrayCode wmsProductPutTrayCode) { + DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode()); + wmsProductPutTrayCode.setRelatStatus("1"); + //barcode + List wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode); + //对应的箱码 + if (wmsProductPutTrayCodeList.size()>0){ + WmsProductPutTrayCode wmsProductPutTrayCode1= wmsProductPutTrayCodeList.get(0); + wmsProductPutTrayCode.setSn(wmsProductPutTrayCode1.getSn());//托盘 + WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); + wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn()); + wmsFpStorageNewsSn.setActiveFlag("1"); + List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + //库位 + if(wmsFpStorageNewsSns.size()>0){ + WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0); + wmsProductPutTrayCode.setWlCode( wmsFpStorageNewsSn1.getWlCode());//库位 + return wmsProductPutTrayCode; + } + } + return null; + } + }