diff --git a/oms_web/oms_vue/src/views/inventory/inner/components/OrderDetail.vue b/oms_web/oms_vue/src/views/inventory/inner/components/OrderDetail.vue index 6f08f376..72123840 100644 --- a/oms_web/oms_vue/src/views/inventory/inner/components/OrderDetail.vue +++ b/oms_web/oms_vue/src/views/inventory/inner/components/OrderDetail.vue @@ -1,6 +1,6 @@ - + 入库信息 @@ -23,6 +23,42 @@ 无 + + + {{ form.purchaseNo }} + - + + + + + + ¥ + + 入库总价格(元) + {{ form.sumInnerPrice || 0 }} + + + + + + 入库数量(件) + {{ form.innerNum || 0 }} + + + + + + 在库数量(件) + {{ form.inventoryNum || 0 }} + + + + + + 出库数量(件) + {{ form.outerNum || 0 }} + + 产品信息 @@ -35,19 +71,171 @@ + + + 在库 + 已发货 + - + + + + + + + 采购单编号: {{ form.purchaseNo }} + + + + + + + + 订单编号: {{ historyDetailData ? historyDetailData.purchaseNo : '' }} + | 版本号: {{ historyDetailData.version }} + + + + + diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsInventoryInner.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsInventoryInner.java index 37140d62..8d9f77c8 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsInventoryInner.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OmsInventoryInner.java @@ -78,6 +78,10 @@ public class OmsInventoryInner extends BaseEntity { private BigDecimal taxRate; private BigDecimal taxTotal; private Long itemId; + private BigDecimal sumInnerPrice; + private Long innerNum; + private Long inventoryNum; + private Long outerNum; private List productTypeList; private List orderCodeList; private List inventoryInfoList; diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsInventoryInnerMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsInventoryInnerMapper.java index b0ac29ae..9e76cf98 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsInventoryInnerMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OmsInventoryInnerMapper.java @@ -19,6 +19,8 @@ public interface OmsInventoryInnerMapper */ public OmsInventoryInner selectOmsInventoryInnerById(Long id); + OmsInventoryInner selectInventoryInfoSummaryByInnerCode(String innerCode); + /** * 查询入库单信息列表 * diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java index 41137f04..334e077f 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java @@ -69,6 +69,13 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService { queryParams.setInnerCode(omsInventoryInner.getInnerCode()); List inventoryInfos = inventoryInfoService.selectInventoryInfoList(queryParams); omsInventoryInner.setInventoryInfoList(inventoryInfos); + OmsInventoryInner inventoryInfoSummary = omsInventoryInnerMapper.selectInventoryInfoSummaryByInnerCode(omsInventoryInner.getInnerCode()); + if (inventoryInfoSummary != null) { + omsInventoryInner.setSumInnerPrice(inventoryInfoSummary.getSumInnerPrice()); + omsInventoryInner.setInnerNum(inventoryInfoSummary.getInnerNum()); + omsInventoryInner.setInventoryNum(inventoryInfoSummary.getInventoryNum()); + omsInventoryInner.setOuterNum(inventoryInfoSummary.getOuterNum()); + } } if (omsInventoryInner != null && StringUtils.isNotEmpty(omsInventoryInner.getOrderCode())) { ProjectInfo projectInfo = projectInfoService.selectProjectInfoByOrderCode(omsInventoryInner.getOrderCode()); diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml index 9a918cbc..c6a1dfc6 100644 --- a/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/inventory/OmsInventoryInnerMapper.xml @@ -20,6 +20,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -77,6 +81,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where t1.id = #{id} + + select sum(inner_price) as sum_inner_price, + count(1) as inner_num, + sum(if(inventory_status = '0', 1, 0)) as inventory_num, + sum(if(inventory_status = '1', 1, 0)) as outer_num + from oms_inventory_info + where inner_code = #{innerCode} + select ifnull( max(SUBSTR( inner_code FROM LENGTH(#{code})+1 FOR 3 )), 0 ) from oms_inventory_inner