zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增库位绑定Feign接口与合并采购销售订单

Browse Source
This commit is contained in:
潘荣晟
2026-01-30 16:00:31 +08:00
parent d28ff3be7f
commit 925860aaff
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java
View File

@@ -174,13 +174,13 @@ public class OrderApiImpl implements OrderApi {
@Override @Override
public CommonResult<List<SalesOrdDtlDTO>> getSalesOrderDetailsByOrderIds(List<Long> ids) { public CommonResult<List<SalesOrdDtlDTO>> getSalesOrderDetailsByOrderIds(List<Long> ids) {
List<SalesOrderDetailDO> salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(SalesOrderDetailDO::getId, ids, SalesOrderDetailDO::getIsEnable, 1); List<SalesOrderDetailDO> salesOrderDetailDOS = SpringUtil.getBean(SalesOrderDetailMapper.class).selectList(SalesOrderDetailDO::getId, ids, SalesOrderDetailDO::getIsEnable, '1');
return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class)); return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class));
} }
@Override @Override
public CommonResult<SalesOrdDtlDTO> getSalesOrderDetailsByOrderId(Long id) { public CommonResult<SalesOrdDtlDTO> 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)); return success(BeanUtils.toBean(salesOrderDetailDOS, SalesOrdDtlDTO.class));
} }
@@ -203,7 +203,7 @@ public class OrderApiImpl implements OrderApi {
} }
PrchOrdDtlMapper prchOrdDtlMapper = SpringUtil.getBean(PrchOrdDtlMapper.class); PrchOrdDtlMapper prchOrdDtlMapper = SpringUtil.getBean(PrchOrdDtlMapper.class);
List<Long> orderIds = orderDTOS.stream().map(OrderDTO::getId).toList(); List<Long> orderIds = orderDTOS.stream().map(OrderDTO::getId).toList();
List<PrchOrdDtlDO> prchOrdDtlDOS = prchOrdDtlMapper.selectList(PrchOrdDtlDO::getOrdId, orderIds, PrchOrdDtlDO::getIsEnb, 1); List<PrchOrdDtlDO> prchOrdDtlDOS = prchOrdDtlMapper.selectList(PrchOrdDtlDO::getOrdId, orderIds, PrchOrdDtlDO::getIsEnb, '1');
orderDTOS.forEach(o -> { orderDTOS.forEach(o -> {
List<OrdDtlDTO> ordDtlDTOS = new ArrayList<>(); List<OrdDtlDTO> ordDtlDTOS = new ArrayList<>();
prchOrdDtlDOS.forEach(p -> { prchOrdDtlDOS.forEach(p -> {
@@ -226,7 +226,7 @@ public class OrderApiImpl implements OrderApi {
} }
SalesOrderDetailMapper salesOrderDetailMapper = SpringUtil.getBean(SalesOrderDetailMapper.class); SalesOrderDetailMapper salesOrderDetailMapper = SpringUtil.getBean(SalesOrderDetailMapper.class);
List<Long> orderIds = orderDTOS.stream().map(OrderDTO::getId).toList(); List<Long> orderIds = orderDTOS.stream().map(OrderDTO::getId).toList();
List<SalesOrderDetailDO> salesOrderDetailDOS = salesOrderDetailMapper.selectList(SalesOrderDetailDO::getOrderId, orderIds, SalesOrderDetailDO::getIsEnable, 1); List<SalesOrderDetailDO> salesOrderDetailDOS = salesOrderDetailMapper.selectList(SalesOrderDetailDO::getOrderId, orderIds, SalesOrderDetailDO::getIsEnable, '1');
orderDTOS.forEach(o -> { orderDTOS.forEach(o -> {
List<OrdDtlDTO> salesOrdDtlDTOS = new ArrayList<>(); List<OrdDtlDTO> salesOrdDtlDTOS = new ArrayList<>();
salesOrderDetailDOS.forEach(s -> { salesOrderDetailDOS.forEach(s -> {

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java
View File

@@ -323,12 +323,12 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
throw exception(MTRL_CODE_NOT_EXISTS); throw exception(MTRL_CODE_NOT_EXISTS);
} }
//查询库位绑定编码 //查询库位绑定编码
WarehouseFactoryRespVO factoryAndWarehouse = getBoundFactoryAndWarehouse(detail.getRcvFactNum(), detail.getRcvWrhNum()); // WarehouseFactoryRespVO factoryAndWarehouse = getBoundFactoryAndWarehouse(detail.getRcvFactNum(), detail.getRcvWrhNum());
// 3.1 行项目基本信息 // 3.1 行项目基本信息
item.setPo_item(detail.getLineNum() != null ? detail.getLineNum().intValue() : null); // 行项目 -> 行号 item.setPo_item(detail.getLineNum() != null ? detail.getLineNum().intValue() : null); // 行项目 -> 行号
item.setMaterial(mtrlZhongtongCode); // 物料编码 -> 物料号 item.setMaterial(mtrlZhongtongCode); // 物料编码 -> 物料号
item.setPlant(factoryAndWarehouse.getErpTargetFactoryNumber()); // 收货工厂编码 -> 工厂 item.setPlant(detail.getRcvFactNum()); // 收货工厂编码 -> 工厂
item.setStge_loc(factoryAndWarehouse.getErpTargetWarehouseNumber()); // 收货库位编码 -> 库存地点 item.setStge_loc(detail.getRcvWrhNum()); // 收货库位编码 -> 库存地点
item.setQuantity(detail.getQty()); // 暂估数量 -> 数量 item.setQuantity(detail.getQty()); // 暂估数量 -> 数量
item.setPo_unit(detail.getUnt()); // 计量单位 -> 计量单位 item.setPo_unit(detail.getUnt()); // 计量单位 -> 计量单位
item.setNet_price(detail.getInTaxUprc()); // 含税单价 -> 含税单价 item.setNet_price(detail.getInTaxUprc()); // 含税单价 -> 含税单价

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java
View File

@@ -247,12 +247,12 @@ public class SalesOrderServiceImpl implements SalesOrderService {
throw exception(MTRL_CODE_NOT_EXISTS); 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(); ErpSalesOrderSaveReqVO.Item item = new ErpSalesOrderSaveReqVO.Item();
item.setItem_categ(String.valueOf(salesOrderDetailRespVO.getLineNumber())); item.setItem_categ(String.valueOf(salesOrderDetailRespVO.getLineNumber()));
item.setMaterial(mtrlZhongtongCode); item.setMaterial(mtrlZhongtongCode);
item.setPlant(boundFactoryAndWarehouse.getErpTargetFactoryNumber()); item.setPlant(salesOrderDetailRespVO.getFactoryNumber());
item.setStore_loc(boundFactoryAndWarehouse.getErpTargetWarehouseNumber()); item.setStore_loc(salesOrderDetailRespVO.getWarehouseNumber());
item.setSales_unit(salesOrderDetailRespVO.getUnit()); item.setSales_unit(salesOrderDetailRespVO.getUnit());
item.setDlvschduse(salesOrderDetailRespVO.getInvoiceType()); item.setDlvschduse(salesOrderDetailRespVO.getInvoiceType());
item.setTarget_qty(salesOrderDetailRespVO.getQuantity()); item.setTarget_qty(salesOrderDetailRespVO.getQuantity());