From 925860aaff92caf916c20f34551368ee08f8bc8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?= <9691125+pan-rongsheng@user.noreply.gitee.com> Date: Fri, 30 Jan 2026 16:00:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=93=E4=BD=8D=E7=BB=91?= =?UTF-8?q?=E5=AE=9AFeign=E6=8E=A5=E5=8F=A3=E4=B8=8E=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zt/plat/module/contractorder/api/OrderApiImpl.java | 8 ++++---- .../service/purchaseorder/PurchaseOrderServiceImpl.java | 6 +++--- .../service/salesorder/SalesOrderServiceImpl.java | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java index bc88dd6e..265370a7 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java @@ -174,13 +174,13 @@ public class OrderApiImpl implements OrderApi { @Override public CommonResult> getSalesOrderDetailsByOrderIds(List ids) { - List salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(SalesOrderDetailDO::getId, ids, SalesOrderDetailDO::getIsEnable, 1); + List salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(SalesOrderDetailDO::getId, ids, SalesOrderDetailDO::getIsEnable, '1'); return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class)); } @Override public CommonResult getSalesOrderDetailsByOrderId(Long id) { - SalesOrderDetailDO salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(SalesOrderDetailDO::getOrderId, id, SalesOrderDetailDO::getIsEnable, 1); + SalesOrderDetailDO salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectOne(SalesOrderDetailDO::getOrderId, id, SalesOrderDetailDO::getIsEnable, '1'); return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class)); } @@ -203,7 +203,7 @@ public class OrderApiImpl implements OrderApi { } PrchOrdDtlMapper prchOrdDtlMapper = SpringUtil.getBean(PrchOrdDtlMapper.class); List orderIds = orderDTOS.stream().map(OrderDTO::getId).toList(); - List prchOrdDtlDOS = prchOrdDtlMapper.selectList(PrchOrdDtlDO::getOrdId, orderIds, PrchOrdDtlDO::getIsEnb, 1); + List prchOrdDtlDOS = prchOrdDtlMapper.selectList(PrchOrdDtlDO::getOrdId, orderIds, PrchOrdDtlDO::getIsEnb, '1'); orderDTOS.forEach(o -> { List ordDtlDTOS = new ArrayList<>(); prchOrdDtlDOS.forEach(p -> { @@ -226,7 +226,7 @@ public class OrderApiImpl implements OrderApi { } SalesOrderDetailMapper salesOrderDetailMapper = SpringUtil.getBean(SalesOrderDetailMapper.class); List orderIds = orderDTOS.stream().map(OrderDTO::getId).toList(); - List salesOrderDetailDOS = salesOrderDetailMapper.selectList(SalesOrderDetailDO::getOrderId, orderIds, SalesOrderDetailDO::getIsEnable, 1); + List salesOrderDetailDOS = salesOrderDetailMapper.selectList(SalesOrderDetailDO::getOrderId, orderIds, SalesOrderDetailDO::getIsEnable, '1'); orderDTOS.forEach(o -> { List salesOrdDtlDTOS = new ArrayList<>(); salesOrderDetailDOS.forEach(s -> { diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java index 7dcacb08..96595620 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java @@ -323,12 +323,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { throw exception(MTRL_CODE_NOT_EXISTS); } //查询库位绑定编码 - WarehouseFactoryRespVO factoryAndWarehouse = getBoundFactoryAndWarehouse(detail.getRcvFactNum(), detail.getRcvWrhNum()); + // WarehouseFactoryRespVO factoryAndWarehouse = getBoundFactoryAndWarehouse(detail.getRcvFactNum(), detail.getRcvWrhNum()); // 3.1 行项目基本信息 item.setPo_item(detail.getLineNum() != null ? detail.getLineNum().intValue() : null); // 行项目 -> 行号 item.setMaterial(mtrlZhongtongCode); // 物料编码 -> 物料号 - item.setPlant(factoryAndWarehouse.getErpTargetFactoryNumber()); // 收货工厂编码 -> 工厂 - item.setStge_loc(factoryAndWarehouse.getErpTargetWarehouseNumber()); // 收货库位编码 -> 库存地点 + item.setPlant(detail.getRcvFactNum()); // 收货工厂编码 -> 工厂 + item.setStge_loc(detail.getRcvWrhNum()); // 收货库位编码 -> 库存地点 item.setQuantity(detail.getQty()); // 暂估数量 -> 数量 item.setPo_unit(detail.getUnt()); // 计量单位 -> 计量单位 item.setNet_price(detail.getInTaxUprc()); // 含税单价 -> 含税单价 diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java index f10db3ec..d44fed69 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java @@ -247,12 +247,12 @@ public class SalesOrderServiceImpl implements SalesOrderService { throw exception(MTRL_CODE_NOT_EXISTS); } //查询对应的库位和工厂 - WarehouseFactoryRespVO boundFactoryAndWarehouse = getBoundFactoryAndWarehouse(salesOrderDetailRespVO.getFactoryNumber(), salesOrderDetailRespVO.getWarehouseNumber()); + // WarehouseFactoryRespVO boundFactoryAndWarehouse = getBoundFactoryAndWarehouse(salesOrderDetailRespVO.getFactoryNumber(), salesOrderDetailRespVO.getWarehouseNumber()); ErpSalesOrderSaveReqVO.Item item = new ErpSalesOrderSaveReqVO.Item(); item.setItem_categ(String.valueOf(salesOrderDetailRespVO.getLineNumber())); item.setMaterial(mtrlZhongtongCode); - item.setPlant(boundFactoryAndWarehouse.getErpTargetFactoryNumber()); - item.setStore_loc(boundFactoryAndWarehouse.getErpTargetWarehouseNumber()); + item.setPlant(salesOrderDetailRespVO.getFactoryNumber()); + item.setStore_loc(salesOrderDetailRespVO.getWarehouseNumber()); item.setSales_unit(salesOrderDetailRespVO.getUnit()); item.setDlvschduse(salesOrderDetailRespVO.getInvoiceType()); item.setTarget_qty(salesOrderDetailRespVO.getQuantity());