From 366b8c7b16f6868fd8da6f7b09b37a14fa9b7de1 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 15 Aug 2024 16:02:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E7=94=9F=E4=BA=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=92=8C?= =?UTF-8?q?=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OdsProcureOrderController.java | 6 +++- .../controller/WmsToWCSmissionController.java | 20 +++++++++-- .../com/op/wms/domain/ProOrderWorkorder.java | 27 +++++++++++++++ .../op/wms/mapper/OdsProcureOrderMapper.java | 2 ++ .../op/wms/mapper/WmsProductPutMapper.java | 2 ++ .../wms/service/IOdsProcureOrderService.java | 2 ++ .../op/wms/service/IWmsProductPutService.java | 2 ++ .../impl/OdsProcureOrderServiceImpl.java | 7 ++++ .../impl/WmsProductPutServiceImpl.java | 33 +++++++++++++++++++ .../mapper/wms/OdsProcureOrderMapper.xml | 3 ++ .../mapper/wms/WmsProductPutMapper.xml | 14 ++++++++ .../mapper/wms/WmsProductPutRecordsMapper.xml | 1 + 12 files changed, 116 insertions(+), 3 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java index dbd70fd0..ed54e9e3 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java @@ -49,7 +49,11 @@ public class OdsProcureOrderController extends BaseController { List list = odsProcureOrderService.selectOdsProcureOrderList(odsProcureOrder); return getDataTable(list); } - + /**获取标识卡**/ + @PostMapping("/getIdCardList") + public List getIdCardList(@RequestBody OdsProcureOrder odsProcureOrder) { + return odsProcureOrderService.getIdCardList(odsProcureOrder); + } /** * 导出包材采购单列表 */ 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 dba3ced1..5538edd9 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 @@ -301,13 +301,20 @@ public class WmsToWCSmissionController { return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderquery(wmsProductPut)); } /** - * 成品 + * 成品入库 * 手持接口：根据报工单号查询－－新---改成扫标识卡 */ @PostMapping("/WmsProductPutByWorkOrderqueryBS") public AjaxResult WmsProductPutByWorkOrderqueryBS(@RequestBody WmsProductPut wmsProductPut) { - return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderqueryBS(wmsProductPut)); + WmsProductPut wmsProductPut1= wmsProductPutService.WmsProductPutByWorkOrderqueryBS(wmsProductPut); + if (wmsProductPut1==null) { + return AjaxResult.error("标识卡未绑定"); + } + return AjaxResult.success(); } + + + /** * 成品 * 手持接口：确认 @@ -644,6 +651,15 @@ public class WmsToWCSmissionController { Integer result= wmsProductPutService.finishedProductProductionRecords(proOrderWorkorder); return success(result); } + /** + * 成品 + * 手持接口：扫标识卡带出信息 + */ + @PostMapping("/finishedProductProductionRecordscar") + public AjaxResult finishedProductProductionRecordscar(@RequestBody ProOrderWorkorder proOrderWorkorder) { + ProOrderWorkorder proOrderWorkorder1= wmsProductPutService.finishedProductProductionRecordscar(proOrderWorkorder); + return AjaxResult.success(proOrderWorkorder1); + } // //查询--成品生产记录 // @PostMapping("/selectProductProductionRecords") // public AjaxResult selectProductProductionRecords(@RequestBody WmsProductProductionRecords wmsProductProductionRecords) { diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java index 06478d04..7f3a0e5f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/ProOrderWorkorder.java @@ -185,6 +185,33 @@ public class ProOrderWorkorder extends TreeEntity { private String prodType; @Excel(name = "托盘") private String sn; + private String attribute1 ; + private String attribute2; + private String attribute3; + + public String getAttribute1() { + return attribute1; + } + + public void setAttribute1(String attribute1) { + this.attribute1 = attribute1; + } + + public String getAttribute2() { + return attribute2; + } + + public void setAttribute2(String attribute2) { + this.attribute2 = attribute2; + } + + public String getAttribute3() { + return attribute3; + } + + public void setAttribute3(String attribute3) { + this.attribute3 = attribute3; + } public String getProdLineName() { return prodLineName; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java index dfe9e495..7c9cdaa1 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java @@ -70,4 +70,6 @@ public interface OdsProcureOrderMapper { List selectOdsProcureOrderAlreadyReaderList(OdsProcureOrder odsProcureOrder); void updateOdsProcureOrderByProcureCode(OdsProcureOrder odsProcureOrder); + + List getIdCardList(OdsProcureOrder odsProcureOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java index 867136fe..6f378db4 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsProductPutMapper.java @@ -79,6 +79,8 @@ public interface WmsProductPutMapper { WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut); + WmsProductPut selectProOrderWorkorderBatchPallet(WmsProductPut wmsProductPut); + // String selectWmsProductPutNum(wmsReportWork wmsReportWork); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java index 574cd180..4fb5c8f8 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java @@ -111,4 +111,6 @@ public interface IOdsProcureOrderService { OrderLine addPurchaseOrderOutboundfc(OrderLine orderLine); void OutboundPostingSAPfc(List orderList); + + List getIdCardList(OdsProcureOrder odsProcureOrder); } 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 832bad7a..ea5878ec 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 @@ -140,4 +140,6 @@ public interface IWmsProductPutService { List selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords); WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut); + + ProOrderWorkorder finishedProductProductionRecordscar(ProOrderWorkorder proOrderWorkorder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index aef6dcfc..c3f836a5 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -1044,6 +1044,13 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } } + @Override + public List getIdCardList(OdsProcureOrder odsProcureOrder) { + List orderList= odsProcureOrderMapper.getIdCardList(odsProcureOrder); + + return null; + } + public String DesignatedPalletOutboundWCS(WMSDesignatedPalle wmsDesignatedPalle) { // 定义请求的URL地址 String url = "http://192.168.202.37:9001/api/v1/ReceiveMesMsg/packingMaterialsOutBoundByPallet"; 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 d29686c8..dcafd9ca 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 @@ -1041,9 +1041,42 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPut.setAttribute2(attribute2); wmsProductPut.setAttribute3(attribute3); WmsProductPut wmsProductPut1 = wmsProductPutMapper.WmsProductPutByWorkOrderqueryBS(wmsProductPut); + //获取托盘信息--首先要他们有绑定数据 + WmsProductProductionRecords wmsProductProductionRecord=new WmsProductProductionRecords(); + wmsProductProductionRecord.setUserDefined1(wmsProductPut.getPallet()); + List wmsProductProductionRecords= wmsProductPutRecordsMapper.selectProductProductionRecords(wmsProductProductionRecord); + if (wmsProductProductionRecords.size()>0){ + WmsProductProductionRecords wmsProductProductionRecords1= wmsProductProductionRecords.get(0); + wmsProductPut.setSn(wmsProductProductionRecords1.getSn()); + }else { + return null; + } return wmsProductPut1; } + @Override + public ProOrderWorkorder finishedProductProductionRecordscar(ProOrderWorkorder proOrderWorkorder) { + DynamicDataSourceContextHolder.push("ds_" + proOrderWorkorder.getFactoryCode()); + String[] attributes = proOrderWorkorder.getAttr1().split("-"); + // 通过索引访问分割后的数组，获取所需的三个属性 + String attribute1 = attributes[0]; // 获取第一个属性 + String attribute2 = attributes[1]; // 获取第二个属性 + String attribute3 = attributes[2]; // 获取第三个属性 + proOrderWorkorder.setWorkorderCodeSap(attribute1); + proOrderWorkorder.setBatchCode(attribute2); + WmsProductPut wmsProductPut =new WmsProductPut(); + wmsProductPut.setWorkOrder(attribute1); + wmsProductPut.setBatchNumber(attribute2); + wmsProductPut.setPallet(attribute3); + WmsProductPut wmsProductPut1= wmsProductPutMapper.selectProOrderWorkorderBatchPallet(wmsProductPut); + proOrderWorkorder.setQuantity(wmsProductPut1.getAttr3()); + proOrderWorkorder.setProdLineCode(wmsProductPut1.getAttr4()); + proOrderWorkorder.setProductCode(wmsProductPut1.getProductCode()); + proOrderWorkorder.setProductName(wmsProductPut1.getProductName()); +// proOrderWorkorder.setAttribute3(attribute3); + return proOrderWorkorder; + } + @Override public List FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index 94a5bb43..ff983ecb 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -80,6 +80,7 @@ and Enterprise_Id = #{enterpriseId} and Enterprise_Code = #{enterpriseCode} + order by Create_Date desc + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml index d05605ab..74bd37ba 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutMapper.xml @@ -414,5 +414,19 @@ AND mes_report_work.batch=#{attribute2} AND mes_report_work.parent_order = '0' + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml index c1791b42..838cd9b3 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsProductPutRecordsMapper.xml @@ -240,5 +240,6 @@ and product_date= #{productDate} and siteCode = #{siteCode} + order by create_time desc