From e7e9d577581ac6d29abf6198434d22e5e550c6a2 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 10 Oct 2024 18:00:00 +0800 Subject: [PATCH] =?UTF-8?q?wms=E5=8C=85=E6=9D=90=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OdsProcureOrderController.java | 9 +++++ .../wms/mapper/OdsProcureOutOrderMapper.java | 2 + .../wms/service/IOdsProcureOrderService.java | 2 + .../impl/OdsProcureOrderServiceImpl.java | 18 +++++++-- .../mapper/wms/OdsProcureOutOrderMapper.xml | 38 +++++++++++++++++++ 5 files changed, 66 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 5cab0e909..42954ab0d 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 @@ -351,4 +351,13 @@ public class OdsProcureOrderController extends BaseController { List list = baseWarehouseService.selectBaseWarehouseListTWO(baseWarehouse); return success(list); } + /** + * 查询包材采购单列表 + */ + @PostMapping("/CKlist") + public TableDataInfo CKlist(OdsProcureOutOrder odsProcureOutOrder) { + startPage(); + List list = odsProcureOrderService.CKlist(odsProcureOutOrder); + return getDataTable(list); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java index 0d7d159ca..ec4b0b23b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java @@ -147,4 +147,6 @@ public interface OdsProcureOutOrderMapper { List selectWmsOdsProcureReturnOrderByID(List orderList); void updateWMSOdsProcureReturnOrderByids(@Param("order") OdsProcureOutOrder order, @Param("list") List sapMaterialPostingList); + + List CKlist(OdsProcureOutOrder odsProcureOutOrder); } 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 61e2fc8b4..30418d049 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 @@ -139,4 +139,6 @@ public interface IOdsProcureOrderService { String addReturnSC(List orderList); String NewConMaterialOutSCNew(List orderList, List gzList); + + List CKlist(OdsProcureOutOrder odsProcureOutOrder); } 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 04b26fd8b..5d3ef2cef 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 @@ -1703,13 +1703,15 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setActive("1"); order.setCreateBy(createBy); order.setCreateDate(new Date()); - //order.setSiteCode(factoryCode); - odsProcureOutOrderMapper.insertWmsRawMissionOut(order); + //order.setSiteCode(factoryCode);} OdsProcureOutOrder odsProcureOutOrder1=new OdsProcureOutOrder(); odsProcureOutOrder1.setProduceCode(produceCode); odsProcureOutOrder1.setMaterialCode(materialCode); List odsProcureOutOrders = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder1); OdsProcureOutOrder order1= odsProcureOutOrders.get(0); + order.setUserDefined4(order1.getUserDefined4()); + odsProcureOutOrderMapper.insertWmsRawMissionOut(order); + BigDecimal realityNumber1 = order1.getOutNumber();//累出库数 BigDecimal realityNumber = order1.getPlanNumber();//计划 BigDecimal planNumber = amount;//本次实际数量 @@ -2439,12 +2441,15 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setCreateBy(createBy); order.setCreateDate(new Date()); //order.setSiteCode(factoryCode); - odsProcureOutOrderMapper.insertWmsRawMissionOut(order); + OdsProcureOutOrder odsProcureOutOrder1=new OdsProcureOutOrder(); odsProcureOutOrder1.setProduceCode(produceCode); odsProcureOutOrder1.setMaterialCode(materialCode); List odsProcureOutOrders = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder1); OdsProcureOutOrder order1= odsProcureOutOrders.get(0); + order.setUserDefined4(order1.getUserDefined4()); + odsProcureOutOrderMapper.insertWmsRawMissionOut(order); + BigDecimal realityNumber1 = order1.getOutNumber();//累出库数 BigDecimal realityNumber = order1.getPlanNumber();//计划 BigDecimal planNumber = amount;//本次实际数量 @@ -2488,6 +2493,13 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return result; } + @Override + @DS("#header.poolName") + public List CKlist(OdsProcureOutOrder odsProcureOutOrder) { + List orderList= odsProcureOutOrderMapper.CKlist(odsProcureOutOrder); + return orderList; + } + // @Override // public String addReturnSC(List orderList) { // String factoryCode = orderList.get(0).getFactoryCode(); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml index 96c76cddb..007d53317 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml @@ -404,6 +404,7 @@ user_defined1, user_defined2, user_defined3, + user_defined4, sn, amount, origin_location, @@ -420,6 +421,7 @@ #{userDefined1}, #{userDefined2}, #{userDefined3}, + #{userDefined4}, #{sn}, #{planNumber}, #{locCode}, @@ -1467,4 +1469,40 @@ +