From c6cc87fb8a48962c71245bcab7e363376a4ec071 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 13 Sep 2024 11:39:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E6=9D=90=E5=87=BA=E5=BA=93=E8=BF=87?= =?UTF-8?q?=E8=B4=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/mapper/OdsProcureOutOrderMapper.java | 63 +++-- .../mapper/WmsOdsMateStorageNewsSnMapper.java | 2 + .../impl/OdsProcureOrderServiceImpl.java | 231 ++++++++++++------ .../mapper/wms/OdsProcureOutOrderMapper.xml | 99 +++++++- .../wms/WmsOdsMateStorageNewsSnMapper.xml | 11 +- 5 files changed, 301 insertions(+), 105 deletions(-) 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 0ad51b28b..0cd4c84d6 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 @@ -4,6 +4,8 @@ import java.util.List; import com.op.system.api.domain.sap.SapMaterialPosting; import com.op.wms.domain.OdsProcureOutOrder; +import com.op.wms.domain.WmsOdsEmStorageNews; +import com.op.wms.domain.WmsOdsMateStorageNews; import org.apache.ibatis.annotations.Param; /** @@ -59,59 +61,68 @@ public interface OdsProcureOutOrderMapper { * @param IDs 需要删除的数据主键集合 * @return 结果 */ - public int deleteOdsProcureOutOrderByIDs(String[] IDs); + public int deleteOdsProcureOutOrderByIDs(String[] IDs); - OdsProcureOutOrder selectmesPrepare(OdsProcureOutOrder odsProcureOrder); + public OdsProcureOutOrder selectmesPrepare(OdsProcureOutOrder odsProcureOrder); - List selectmesPrepareDetail(OdsProcureOutOrder odsProcureOutOrder); + public List selectmesPrepareDetail(OdsProcureOutOrder odsProcureOutOrder); - void insertWmsRawMissionOut(OdsProcureOutOrder order); + public void insertWmsRawMissionOut(OdsProcureOutOrder order); - void updateOdsProcureOutOrderByid(OdsProcureOutOrder odsProcureOutOrder); + public void updateOdsProcureOutOrderByid(OdsProcureOutOrder odsProcureOutOrder); - List selectOdsProcureOutOrderListByIds(@Param("list") List orderList); + public List selectOdsProcureOutOrderListByIds(@Param("list") List orderList); - List selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder); + public List selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder); - List selectOdsProcureOutOrderListZUT(OdsProcureOutOrder odsProcureOutOrder1); + public List selectOdsProcureOutOrderListZUT(OdsProcureOutOrder odsProcureOutOrder1); - List selectOdsProcureOutOrderListByu1(@Param("list") List orderList); + public List selectOdsProcureOutOrderListByu1(@Param("list") List orderList); - void updateOdsProcureOutOrderByids(@Param("order") OdsProcureOutOrder order, @Param("list") List sapMaterialPostingList); + public void updateOdsProcureOutOrderByids(@Param("order") OdsProcureOutOrder order, @Param("list") List sapMaterialPostingList); - List selectOdsProcureOutOrderListZUKEN(OdsProcureOutOrder order); + public List selectOdsProcureOutOrderListZUKEN(OdsProcureOutOrder order); - List selectOdsProcureOutOrderListZUKENX(OdsProcureOutOrder order); + public List selectOdsProcureOutOrderListZUKENX(OdsProcureOutOrder order); - String selectMachineCode(@Param("order")OdsProcureOutOrder odsProcureOutOrder); + public String selectMachineCode(@Param("order")OdsProcureOutOrder odsProcureOutOrder); - List selectmesPrepareDetailWhite(OdsProcureOutOrder odsProcureOutOrder); + public List selectmesPrepareDetailWhite(OdsProcureOutOrder odsProcureOutOrder); - OdsProcureOutOrder selectmesPreparelike(OdsProcureOutOrder odsProcureOrder); + public OdsProcureOutOrder selectmesPreparelike(OdsProcureOutOrder odsProcureOrder); - List selectOdsProcureOutOrderListZUfc(OdsProcureOutOrder odsProcureOutOrder); + public List selectOdsProcureOutOrderListZUfc(OdsProcureOutOrder odsProcureOutOrder); - List PurchaseOrderOutboundPdafc(OdsProcureOutOrder odsProcureOrder); + public List PurchaseOrderOutboundPdafc(OdsProcureOutOrder odsProcureOrder); public int insertOdsProcureOutOrderfc(OdsProcureOutOrder odsProcureOutOrder); - List selectOdsProcureOutOrderListByu1fc(List orderList); + public List selectOdsProcureOutOrderListByu1fc(List orderList); - void updateOdsProcureOutOrderByidsfc(@Param("order") OdsProcureOutOrder order, @Param("list") List sapMaterialPostingList); + public void updateOdsProcureOutOrderByidsfc(@Param("order") OdsProcureOutOrder order, @Param("list") List sapMaterialPostingList); - OdsProcureOutOrder selectOdsProcureOutOrderListZUfcsy(OdsProcureOutOrder odsProcureOutOrder); + public OdsProcureOutOrder selectOdsProcureOutOrderListZUfcsy(OdsProcureOutOrder odsProcureOutOrder); - OdsProcureOutOrder selectMesPrepareBC(OdsProcureOutOrder odsProcureOutOrder); + public OdsProcureOutOrder selectMesPrepareBC(OdsProcureOutOrder odsProcureOutOrder); - List selectMesPrepareDetailBC(OdsProcureOutOrder order); + public List selectMesPrepareDetailBC(OdsProcureOutOrder order); - List selectWmsOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder); + public List selectWmsOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder); public void insertWmsOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder1); - OdsProcureOutOrder selectWmsOdsProcureOutOrderByID(String id); + public OdsProcureOutOrder selectWmsOdsProcureOutOrderByID(String id); - void updateWmsOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder1); + public void updateWmsOdsProcureOutOrder(OdsProcureOutOrder odsProcureOutOrder1); - List selectOdsProcureOutOrderListZC(OdsProcureOutOrder odsProcureOutOrder); + public List selectOdsProcureOutOrderListZC(OdsProcureOutOrder odsProcureOutOrder); + + public List selectWmsOdsProcureOutOrderByIDs(@Param("list") List orderList); + + void updateWMSOdsProcureOutOrderByids(@Param("order") OdsProcureOutOrder order, @Param("list") List sapMaterialPostingList); + + + List selectWmsRawMissionOutByPrdAndMa(OdsProcureOutOrder order1); + + List selectPreDetailHzList(OdsProcureOutOrder odsProcureOutOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java index e8cb32b5f..fc7411056 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsSnMapper.java @@ -76,4 +76,6 @@ public interface WmsOdsMateStorageNewsSnMapper { public void updateWmsOdsMateStorageNewsSnAddoutNumber(WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn); public WmsOdsMateStorageNewsSn selectWmsOdsMateStorageNewsSnByWlCodeTEM(WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn); + + void updatesub(WmsOdsMateStorageNews wmsOdsMateStorageNews); } 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 c97352d02..536ad7068 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 @@ -1457,58 +1457,116 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { @Override public List ProductionMaterialRequisitionSC(OdsProcureOutOrder odsProcureOutOrder) { - //二维码获取的信息查询对应的sap生产订单，再用生产订单查询子单 DynamicDataSourceContextHolder.push("ds_" + odsProcureOutOrder.getFactoryCode()); - List orderLists=new ArrayList<>(); - List orderListone= odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder); - if (orderListone.size()>0){ - for (OdsProcureOutOrder order:orderListone){ - if (!"3".equals(order.getOrderStatus())){ - orderLists.add(order); - } - } - return orderLists; - } - OdsProcureOutOrder order = odsProcureOutOrderMapper.selectMesPrepareBC(odsProcureOutOrder); - List orderList= odsProcureOutOrderMapper.selectMesPrepareDetailBC(order); + if (odsProcureOutOrder.getUserDefined4().length()<=10){ + //二维码获取的信息查询对应的sap生产订单，再用生产订单查询子单 - //根据订单号查询对应的最大批次号 - Integer orderItem = 0; - for (OdsProcureOutOrder orderLine1 : - orderList) { - orderItem++; - orderLine1.setUserDefined2(String.format("%05d", orderItem)); + List orderLists=new ArrayList<>(); + List orderListone= odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder); + if (orderListone.size()>0){ + for (OdsProcureOutOrder order:orderListone){ + if (!"3".equals(order.getOrderStatus())){ + orderLists.add(order); + } + } + return orderLists; + } +// OdsProcureOutOrder order = odsProcureOutOrderMapper.selectMesPrepareBC(odsProcureOutOrder); + List orderList= odsProcureOutOrderMapper.selectPreDetailHzList(odsProcureOutOrder); + //根据订单号查询对应的最大批次号 + Integer orderItem = 0; + for (OdsProcureOutOrder orderLine1 : + orderList) { + orderItem++; + orderLine1.setUserDefined2(String.format("%05d", orderItem)); + } + List orderList1=new ArrayList<>(); + for (OdsProcureOutOrder order1: + orderList) { + OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder(); + odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID()); + odsProcureOutOrder1.setSiteCode(order1.getFactoryCode()); + odsProcureOutOrder1.setProduceCode(odsProcureOutOrder.getUserDefined4());//反冲 + odsProcureOutOrder1.setOutNumber(new BigDecimal("0")); + //odsProcureOutOrder1.setLocCode(order.getWarehouseNo()); + odsProcureOutOrder1.setMaterialCode(order1.getMaterialCode()); + odsProcureOutOrder1.setMaterialDesc(order1.getMaterialDesc()); + odsProcureOutOrder1.setPlanDate(new Date()); + odsProcureOutOrder1.setUnit(order1.getUnit()); + odsProcureOutOrder1.setUserDefined5(odsProcureOutOrder.getUserDefined4()); + //odsProcureOutOrder1.setProductionLineCode(order1.getStationNo()); + //odsProcureOutOrder1.setUserDefined1(orderLine1.getBatchNo()); + odsProcureOutOrder1.setActive("1"); + odsProcureOutOrder1.setOrderStatus("1");// + odsProcureOutOrder1.setPlanNumber(order1.getPlanNumber()); + odsProcureOutOrder1.setUserDefined2(order1.getUserDefined2()); + odsProcureOutOrder1.setUserDefined3(order1.getUserDefined3()); + odsProcureOutOrder1.setUserDefined4(odsProcureOutOrder.getUserDefined4()); + odsProcureOutOrder1.setUserDefined10("1"); + odsProcureOutOrder1.setCreateBy(odsProcureOutOrder.getCreateBy()); + odsProcureOutOrder1.setCreateDate(new Date()); + //odsProcureOutOrder1.setCreateDate(new Date()); + //odsProcureOutOrder.set + odsProcureOutOrderMapper.insertWmsOdsProcureOutOrder(odsProcureOutOrder1); + orderList1.add(odsProcureOutOrder1); + } + return orderList1; + }else { + //二维码获取的信息查询对应的sap生产订单，再用生产订单查询子单 + + List orderLists=new ArrayList<>(); + List orderListone= odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder); + if (orderListone.size()>0){ + for (OdsProcureOutOrder order:orderListone){ + if (!"3".equals(order.getOrderStatus())){ + orderLists.add(order); + } + } + return orderLists; + } + OdsProcureOutOrder order = odsProcureOutOrderMapper.selectMesPrepareBC(odsProcureOutOrder); + List orderList= odsProcureOutOrderMapper.selectMesPrepareDetailBC(order); + + //根据订单号查询对应的最大批次号 + Integer orderItem = 0; + for (OdsProcureOutOrder orderLine1 : + orderList) { + orderItem++; + orderLine1.setUserDefined2(String.format("%05d", orderItem)); + } + List orderList1=new ArrayList<>(); + for (OdsProcureOutOrder order1: + orderList) { + OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder(); + odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID()); + odsProcureOutOrder1.setSiteCode(order1.getFactoryCode()); + odsProcureOutOrder1.setProduceCode(order.getProduceCode()); + odsProcureOutOrder1.setOutNumber(new BigDecimal("0")); + //odsProcureOutOrder1.setLocCode(order.getWarehouseNo()); + odsProcureOutOrder1.setMaterialCode(order1.getMaterialCode()); + odsProcureOutOrder1.setMaterialDesc(order1.getMaterialDesc()); + odsProcureOutOrder1.setPlanDate(new Date()); + odsProcureOutOrder1.setUnit(order1.getUnit()); + //odsProcureOutOrder1.setProductionLineCode(order1.getStationNo()); + //odsProcureOutOrder1.setUserDefined1(orderLine1.getBatchNo()); + odsProcureOutOrder1.setActive("1"); + odsProcureOutOrder1.setOrderStatus("1");// + odsProcureOutOrder1.setPlanNumber(order1.getPlanNumber()); + odsProcureOutOrder1.setUserDefined2(order1.getUserDefined2()); + odsProcureOutOrder1.setUserDefined3(order1.getUserDefined3()); + odsProcureOutOrder1.setUserDefined4(odsProcureOutOrder.getUserDefined4()); + odsProcureOutOrder1.setUserDefined10("1"); + odsProcureOutOrder1.setUserDefined5(order1.getNeedDate()); + odsProcureOutOrder1.setCreateBy(odsProcureOutOrder.getCreateBy()); + odsProcureOutOrder1.setCreateDate(new Date()); + //odsProcureOutOrder1.setCreateDate(new Date()); + //odsProcureOutOrder.set + odsProcureOutOrderMapper.insertWmsOdsProcureOutOrder(odsProcureOutOrder1); + orderList1.add(odsProcureOutOrder1); + } + return orderList1; } - List orderList1=new ArrayList<>(); - for (OdsProcureOutOrder order1: - orderList) { - OdsProcureOutOrder odsProcureOutOrder1 = new OdsProcureOutOrder(); - odsProcureOutOrder1.setID(IdUtils.fastSimpleUUID()); - odsProcureOutOrder1.setSiteCode(order1.getFactoryCode()); - odsProcureOutOrder1.setProduceCode(order.getProduceCode()); - odsProcureOutOrder1.setOutNumber(new BigDecimal("0")); - //odsProcureOutOrder1.setLocCode(order.getWarehouseNo()); - odsProcureOutOrder1.setMaterialCode(order1.getMaterialCode()); - odsProcureOutOrder1.setMaterialDesc(order1.getMaterialDesc()); - odsProcureOutOrder1.setPlanDate(new Date()); - odsProcureOutOrder1.setUnit(order1.getUnit()); - //odsProcureOutOrder1.setProductionLineCode(order1.getStationNo()); - //odsProcureOutOrder1.setUserDefined1(orderLine1.getBatchNo()); - odsProcureOutOrder1.setActive("1"); - odsProcureOutOrder1.setOrderStatus("1");// - odsProcureOutOrder1.setPlanNumber(order1.getPlanNumber()); - odsProcureOutOrder1.setUserDefined2(order1.getUserDefined2()); - odsProcureOutOrder1.setUserDefined3(order1.getUserDefined3()); - odsProcureOutOrder1.setUserDefined4(odsProcureOutOrder.getUserDefined4()); - odsProcureOutOrder1.setUserDefined10("1"); - odsProcureOutOrder1.setCreateBy(odsProcureOutOrder.getCreateBy()); - odsProcureOutOrder1.setCreateDate(new Date()); - odsProcureOutOrder1.setCreateDate(new Date()); - //odsProcureOutOrder.set - odsProcureOutOrderMapper.insertWmsOdsProcureOutOrder(odsProcureOutOrder1); - orderList1.add(odsProcureOutOrder1); - } - return orderList1; + } @Override @@ -1569,6 +1627,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setActive("1"); order.setCreateBy(createBy); order.setCreateDate(new Date()); + order.setSiteCode(factoryCode); odsProcureOutOrderMapper.insertWmsRawMissionOut(order); OdsProcureOutOrder odsProcureOutOrder1=new OdsProcureOutOrder(); odsProcureOutOrder1.setProduceCode(produceCode); @@ -1614,18 +1673,25 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { //先根据出库单获取 // * 退料的移动类型为 262 // * 领料的移动类型为 261 - // List orderList1=odsProcureOutOrderMapper.selectOdsProcureOutOrderListByIds(orderList); - List orderList1 = odsProcureOutOrderMapper.selectOdsProcureOutOrderListByu1(orderList); - //查询这个地方先暂时去掉Order_Status = '3' 条件 - //List sapMaterialPostingList=new ArrayList<>(); - List orderList2 = new ArrayList<>(); - List> mapList = new ArrayList<>(); + List orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderByIDs(orderList); + List orderList2 = new ArrayList<>();//非反冲 + List> mapList = new ArrayList<>();//非反冲 List sapMaterialPostingFCList = new ArrayList<>();//反冲 List orderList2FC = new ArrayList<>();//反冲 for (OdsProcureOutOrder odsProcureOutOrder : orderList1) { - //取ｓａｐ仓库号 - if ("X".equals(odsProcureOutOrder.getUserDefined3())) { + if (!"X".equals(odsProcureOutOrder.getUserDefined3())){ + Map map = new HashMap<>(); + map.put("AUFNR", odsProcureOutOrder.getProduceCode()); + map.put("PLANT", odsProcureOutOrder.getSiteCode()); + String lgort = baseWarehouseMapper.selectByCode(odsProcureOutOrder.getLocCode()); + map.put("LGORT", lgort); + map.put("MATNR", odsProcureOutOrder.getMaterialCode()); + map.put("QUANTITY", odsProcureOutOrder.getOutNumber().toString()); + map.put("MEINS", odsProcureOutOrder.getUnit()); + mapList.add(map); + orderList2.add(odsProcureOutOrder); + }else { SapBackflushMPQuery sapBackflushMPQuery = new SapBackflushMPQuery(); sapBackflushMPQuery.setPlant(odsProcureOutOrder.getSiteCode()); //工厂 String lgort = baseWarehouseMapper.selectByCode(odsProcureOutOrder.getLocCode()); @@ -1636,20 +1702,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { sapBackflushMPQuery.setBatch(odsProcureOutOrder.getUserDefined2()); //批号 sapMaterialPostingFCList.add(sapBackflushMPQuery); orderList2FC.add(odsProcureOutOrder); - } else { - Map map = new HashMap<>(); - map.put("AUFNR", odsProcureOutOrder.getProduceCode()); - map.put("PLANT", odsProcureOutOrder.getSiteCode()); - String lgort = baseWarehouseMapper.selectByCode(odsProcureOutOrder.getLocCode()); - map.put("LGORT", lgort); - map.put("MATNR", odsProcureOutOrder.getMaterialCode()); - map.put("QUANTITY", odsProcureOutOrder.getOutNumber().toString()); - map.put("MEINS", odsProcureOutOrder.getUnit()); - mapList.add(map); - orderList2.add(odsProcureOutOrder); - } + } } - if (mapList.size() > 0) {//非反冲过账 + if (mapList.size() > 0) { + //非反冲过账 SapMaterialPosting sapMaterialPosting = new SapMaterialPosting(); sapMaterialPosting.setPostingType("261"); sapMaterialPosting.setMapList(mapList); @@ -1666,15 +1722,25 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { String userDefined9 = (String) map.get("MATERIALDOCUMENT"); order.setUserDefined9(userDefined9); order.setUserDefined10("2");//成功 - odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order, orderList2); - - } else {// + odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2); + for (OdsProcureOutOrder order1: + orderList2) { + //过账成功--减库存 + List odsEmStorageNews= odsProcureOutOrderMapper.selectWmsRawMissionOutByPrdAndMa(order1); + for (WmsOdsMateStorageNews wmsOdsMateStorageNews: + odsEmStorageNews) { + //wmsOdsMateStorageNews + wmsOdsMateStorageNews.setLastModifiedBy(SecurityUtils.getUsername()); + wmsOdsMateStorageNewsSnMapper.updatesub(wmsOdsMateStorageNews);//库存调整 + } + } + } else { + // order.setUserDefined9(""); order.setUserDefined10("3");//失败 - odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order, orderList2); + odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2); } } - if (sapMaterialPostingFCList.size() > 0) { //反冲过账 R result2 = remoteSapService.sapBackflushMP(sapMaterialPostingFCList);//x @@ -1689,11 +1755,22 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { String userDefined9 = (String) map.get("MATERIALDOCUMENT"); order.setUserDefined9(userDefined9); order.setUserDefined10("2");//成功 - odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order, orderList2FC); + odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2FC); + for (OdsProcureOutOrder order1: + orderList2FC) { + //过账成功--减库存 + List odsEmStorageNews= odsProcureOutOrderMapper.selectWmsRawMissionOutByPrdAndMa(order1); + for (WmsOdsMateStorageNews wmsOdsMateStorageNews: + odsEmStorageNews) { + //wmsOdsMateStorageNews + wmsOdsMateStorageNews.setLastModifiedBy(SecurityUtils.getUsername()); + wmsOdsMateStorageNewsSnMapper.updatesub(wmsOdsMateStorageNews);//库存调整 + } + } } else {// order.setUserDefined9(""); order.setUserDefined10("3");//失败 - odsProcureOutOrderMapper.updateOdsProcureOutOrderByids(order, orderList2FC); + odsProcureOutOrderMapper.updateWMSOdsProcureOutOrderByids(order, orderList2FC); } } } 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 677c4c748..508a72dd7 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 @@ -440,6 +440,17 @@ #{item.ID} + + update wms_ods_procure_out_order + set User_Defined10 = #{order.userDefined10}, + User_Defined9 = #{order.userDefined9}, + User_Defined11 = #{order.userDefined11} + where ID in + + #{item.ID} + + + update ods_procure_out_order_fc set User_Defined10 = #{order.userDefined10}, @@ -755,6 +766,52 @@ wms_ods_procure_out_order where ID = #{ID} + + + diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml index baa35b773..bf2a85d01 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsSnMapper.xml @@ -205,11 +205,20 @@ update wms_ods_mate_storage_news - set occupy_amount = occupy_amount + #{amount}, + set occupy_amount =ISNULL(occupy_amount, 0) + #{amount}, last_modified_by=#{lastModifiedBy}, gmt_modified=GETDATE() where wh_code=#{whCode} and wa_code=#{waCode} and wl_code=#{wlCode} and material_code=#{materialCode} + + update wms_ods_mate_storage_news + set occupy_amount =ISNULL(occupy_amount, 0) - #{amount}, + amount = ISNULL(amount, 0) - #{amount}, + last_modified_by=#{lastModifiedBy}, + gmt_modified=GETDATE() + where wh_code=#{userDefined2} and wa_code=#{waCode} and wl_code=#{userDefined3} and material_code=#{materialCode} + +