From 8acc68141d30a95effef0e18e0806e4be183334a Mon Sep 17 00:00:00 2001 From: jiangpeng Date: Mon, 1 Jun 2026 02:30:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=A2=E5=8D=95=E9=85=8D?= =?UTF-8?q?=E5=A4=87=E8=B4=A7=E7=9B=B8=E5=85=B3=E9=93=BE=E8=B7=AF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oms_web/oms_vue/src/api/project/order.js | 4 ++-- .../oms_vue/src/views/inventory/execution/index.vue | 6 ++++-- .../controller/vue/VueProjectOrderInfoController.java | 4 ++-- .../com/ruoyi/sip/domain/OmsPurchaseOrderMap.java | 2 ++ .../ruoyi/sip/mapper/OmsPurchaseOrderMapMapper.java | 4 +++- .../com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java | 3 ++- .../ruoyi/sip/service/IProjectOrderInfoService.java | 2 +- .../service/impl/InventoryDeliveryServiceImpl.java | 4 ++-- .../sip/service/impl/ProjectOrderInfoServiceImpl.java | 11 +++++++---- .../mapper/sip/OmsPurchaseOrderMapMapper.xml | 8 +++++--- .../resources/mapper/sip/ProjectOrderInfoMapper.xml | 4 +++- 11 files changed, 33 insertions(+), 19 deletions(-) diff --git a/oms_web/oms_vue/src/api/project/order.js b/oms_web/oms_vue/src/api/project/order.js index 5c7b0aa9..039113ae 100644 --- a/oms_web/oms_vue/src/api/project/order.js +++ b/oms_web/oms_vue/src/api/project/order.js @@ -114,11 +114,11 @@ export function savePurchaseOrderMap(data) { } // 查询采购单SN码列表 -export function purchaseSnList(purchaseNo, orderCode) { +export function purchaseSnList(purchaseNo, orderCode, productCode) { return request({ url: '/project/order/vue/purchaseSnList', method: 'get', - params: { purchaseNo, orderCode } + params: { purchaseNo, orderCode, productCode } }) } diff --git a/oms_web/oms_vue/src/views/inventory/execution/index.vue b/oms_web/oms_vue/src/views/inventory/execution/index.vue index 7fcd448a..0cd81ccf 100644 --- a/oms_web/oms_vue/src/views/inventory/execution/index.vue +++ b/oms_web/oms_vue/src/views/inventory/execution/index.vue @@ -416,7 +416,7 @@
- 当前仓库SN码总数：{{ getWarehouseSnCount(outerSnActiveWarehouse) }} + savePurchaseOrderMap({ orderId: item.orderId, purchaseId: item.purchaseId, + productCode: item.productCode, bindNum: item.bindNum }))).then(() => { this.$message.success('保存成功'); @@ -973,7 +975,7 @@ export default { } this.outerSnDialogVisible = true; this.outerSnLoading = true; - purchaseSnList(row.purchaseNo, this.stockingDetailRow.orderCode).then(response => { + purchaseSnList(row.purchaseNo, this.stockingDetailRow.orderCode, item.productCode).then(response => { const data = response.data || {}; this.outerSnDetail = { totalQuantity: data.totalQuantity || 0, diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java index ff90e605..6202e2cd 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java @@ -191,8 +191,8 @@ public class VueProjectOrderInfoController extends BaseController { * 采购单SN码列表 */ @GetMapping("/purchaseSnList") - public AjaxResult purchaseSnList(@RequestParam String purchaseNo, @RequestParam String orderCode) { - return AjaxResult.success(projectOrderInfoService.selectPurchaseSnList(purchaseNo, orderCode)); + public AjaxResult purchaseSnList(@RequestParam String purchaseNo, @RequestParam String orderCode, @RequestParam(required = false) String productCode) { + return AjaxResult.success(projectOrderInfoService.selectPurchaseSnList(purchaseNo, orderCode, productCode)); } /** diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderMap.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderMap.java index 2c87d4db..3d8a62a8 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderMap.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsPurchaseOrderMap.java @@ -11,5 +11,7 @@ public class OmsPurchaseOrderMap { private Long purchaseId; + private String productCode; + private Integer bindNum; } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapMapper.java index e104aa9f..7ae9ef80 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsPurchaseOrderMapMapper.java @@ -5,7 +5,9 @@ import org.apache.ibatis.annotations.Param; public interface OmsPurchaseOrderMapMapper { - OmsPurchaseOrderMap selectByOrderIdAndPurchaseId(@Param("orderId") Long orderId, @Param("purchaseId") Long purchaseId); + OmsPurchaseOrderMap selectByOrderIdAndPurchaseId(@Param("orderId") Long orderId, + @Param("purchaseId") Long purchaseId, + @Param("productCode") String productCode); int insertOmsPurchaseOrderMap(OmsPurchaseOrderMap omsPurchaseOrderMap); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java index 662b4f34..dd1d4fdd 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/ProjectOrderInfoMapper.java @@ -109,6 +109,7 @@ public interface ProjectOrderInfoMapper int selectPurchaseOrderMapBindNum(@Param("purchaseNo") String purchaseNo, @Param("orderCode") String orderCode); - List selectProductMatchSnDetailList(@Param("purchaseNo") String purchaseNo); + List selectProductMatchSnDetailList(@Param("purchaseNo") String purchaseNo, + @Param("productCode") String productCode); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java index 359416b2..833abddc 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/IProjectOrderInfoService.java @@ -118,7 +118,7 @@ public interface IProjectOrderInfoService int savePurchaseOrderMap(OmsPurchaseOrderMap omsPurchaseOrderMap); - OrderProductMatchSnDto selectPurchaseSnList(String purchaseNo, String orderCode); + OrderProductMatchSnDto selectPurchaseSnList(String purchaseNo, String orderCode, String productCode); int bindOrderSnCodes(BindOrderSnCodesDto params); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java index 7e6777d4..303c3ac0 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/InventoryDeliveryServiceImpl.java @@ -130,7 +130,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { if (purchaseOrder == null) { throw new ServiceException("采购单信息不存在"); } - OmsPurchaseOrderMap purchaseOrderMap = omsPurchaseOrderMapMapper.selectByOrderIdAndPurchaseId(orderInfo.getId(), purchaseOrder.getId()); + OmsPurchaseOrderMap purchaseOrderMap = omsPurchaseOrderMapMapper.selectByOrderIdAndPurchaseId(orderInfo.getId(), purchaseOrder.getId(), inventoryDelivery.getProductCode()); if (purchaseOrderMap == null || purchaseOrderMap.getBindNum() == null || purchaseOrderMap.getBindNum() <= 0) { throw new ServiceException("当前订单与采购单未建立绑定关系或绑定数量为0"); } @@ -170,7 +170,7 @@ public class InventoryDeliveryServiceImpl implements IInventoryDeliveryService { throw new ServiceException(String.format("采购单[%s]信息不存在", purchaseNo)); } - OmsPurchaseOrderMap purchaseOrderMap = omsPurchaseOrderMapMapper.selectByOrderIdAndPurchaseId(orderInfo.getId(), purchaseOrder.getId()); + OmsPurchaseOrderMap purchaseOrderMap = omsPurchaseOrderMapMapper.selectByOrderIdAndPurchaseId(orderInfo.getId(), purchaseOrder.getId(), inventoryDelivery.getProductCode()); if (purchaseOrderMap == null || purchaseOrderMap.getBindNum() == null || purchaseOrderMap.getBindNum() <= 0) { throw new ServiceException(String.format("订单与采购单[%s]未建立绑定关系或绑定数量为0", purchaseNo)); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index 278130ef..fcec1927 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -2889,7 +2889,11 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To @Override public int savePurchaseOrderMap(OmsPurchaseOrderMap omsPurchaseOrderMap) { - OmsPurchaseOrderMap exist = omsPurchaseOrderMapMapper.selectByOrderIdAndPurchaseId(omsPurchaseOrderMap.getOrderId(), omsPurchaseOrderMap.getPurchaseId()); + OmsPurchaseOrderMap exist = omsPurchaseOrderMapMapper.selectByOrderIdAndPurchaseId( + omsPurchaseOrderMap.getOrderId(), + omsPurchaseOrderMap.getPurchaseId(), + omsPurchaseOrderMap.getProductCode() + ); int result; if (exist == null) { result = omsPurchaseOrderMapMapper.insertOmsPurchaseOrderMap(omsPurchaseOrderMap); @@ -2905,10 +2909,9 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To } @Override - public OrderProductMatchSnDto selectPurchaseSnList(String purchaseNo, String orderCode) { + public OrderProductMatchSnDto selectPurchaseSnList(String purchaseNo, String orderCode, String productCode) { OrderProductMatchSnDto result = new OrderProductMatchSnDto(); - List snList = projectOrderInfoMapper.selectProductMatchSnDetailList(purchaseNo); -// result.setTotalQuantity(projectOrderInfoMapper.selectProductMatchSnCountlList(purchaseNo)); + List snList = projectOrderInfoMapper.selectProductMatchSnDetailList(purchaseNo, productCode); result.setTotalQuantity(snList.size()); Integer quotaQuantity = projectOrderInfoMapper.selectPurchaseOrderMapBindNum(purchaseNo, orderCode); result.setQuotaQuantity(quotaQuantity); diff --git a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapMapper.xml index 101210ca..98fcc80d 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/OmsPurchaseOrderMapMapper.xml @@ -8,20 +8,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - insert into oms_purchase_order_map(order_id, purchase_id, bind_num) - values (#{orderId}, #{purchaseId}, #{bindNum}) + insert into oms_purchase_order_map(order_id, purchase_id, product_code, bind_num) + values (#{orderId}, #{purchaseId}, #{productCode}, #{bindNum}) diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml index db2f9b5c..e26c57fc 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml @@ -965,7 +965,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (select vendor_address from oms_vendor_info as tt where tt.vendor_id = t6.vendor_id) as vendor_address, max(t4.price) as price, t4.quantity as cg_num, - t4.quantity - ifnull((select sum(bind_num) from oms_purchase_order_map as tt where tt.purchase_id = t4.purchase_id), 0) as ky_num, + t4.quantity - ifnull((select sum(bind_num) from oms_purchase_order_map as tt + where tt.purchase_id = t4.purchase_id and tt.product_code = t4.product_code), 0) as ky_num, t5.bind_num as ph_num, t6.status, ( @@ -1030,6 +1031,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join oms_warehouse_info as t3 on t2.warehouse_id = t3.id where t2.purchase_no = #{purchaseNo} + and t1.product_code = #{productCode} order by t1.product_sn