From fdb9cccfe8d9132738404fee3f6d6818bd1d3fde Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:44:06 +0800
Subject: [PATCH 01/12] fix: add salePrice and purchasePrice in product stock
 mapper file

---
 .../mapper_xml/product/ProductStockMapper.xml        | 12 +++++++-----
 .../wansenai/vo/product/ProductStockKeepUnitVO.java  |  6 ++++++
 .../com/wansenai/vo/report/ProductStockSkuVO.java    |  9 +++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/core/dao/src/main/resources/mapper_xml/product/ProductStockMapper.xml b/core/dao/src/main/resources/mapper_xml/product/ProductStockMapper.xml
index 32d858f6..7116ae40 100644
--- a/core/dao/src/main/resources/mapper_xml/product/ProductStockMapper.xml
+++ b/core/dao/src/main/resources/mapper_xml/product/ProductStockMapper.xml
@@ -16,11 +16,13 @@
         <result property="stock" column="current_stock_quantity" />
         <result property="extendInfo" column="product_manufacturer" />
         <result property="retailPrice" column="retail_price" />
+        <result property="salePrice" column="sale_price" />
+        <result property="purchasePrice" column="purchase_price" />
     </resultMap>
 
     <select id="getProductSkuList" resultMap="productResultMap" parameterType="com.baomidou.mybatisplus.core.metadata.IPage">
         SELECT ps.id, p.id AS productId, p.product_category_id, p.product_name, p.product_model, p.product_standard, p.product_color,
-        sku.product_bar_code, sku.multi_attribute, sku.product_unit, sku.retail_price, p.product_manufacturer,pc.category_name,
+        sku.product_bar_code, sku.multi_attribute, sku.product_unit, sku.retail_price, sku.sale_price, sku.purchase_price, p.product_manufacturer,pc.category_name,
         ps.current_stock_quantity, w.warehouse_name, ps.warehouse_id
         FROM product_stock AS ps
         LEFT JOIN warehouse as w ON ps.warehouse_id = w.id
@@ -48,7 +50,7 @@
 
     <select id="getProductSkuByBarCode" resultMap="productResultMap">
         SELECT sku.id, p.id AS productId, p.product_category_id, p.product_name, p.product_model, p.product_standard, p.product_color,
-               sku.product_bar_code, sku.multi_attribute, sku.product_unit, sku.retail_price, p.product_manufacturer,
+               sku.product_bar_code, sku.multi_attribute, sku.product_unit, sku.retail_price, sku.sale_price, sku.purchase_price, p.product_manufacturer,
                pc.category_name, ps.current_stock_quantity, ps.warehouse_id
         FROM product_stock AS ps
                  LEFT JOIN product_sku AS sku ON sku.id = ps.product_sku_id
@@ -59,7 +61,7 @@
 
     <select id="getProductSkuDetail" resultMap="productResultMap">
         SELECT sku.id, p.id AS productId, p.product_category_id, p.product_name, p.product_model, p.product_standard, p.product_color,
-               sku.product_bar_code, sku.multi_attribute, sku.product_unit, sku.retail_price, p.product_manufacturer,
+               sku.product_bar_code, sku.multi_attribute, sku.product_unit, sku.retail_price, sku.sale_price, sku.purchase_price, p.product_manufacturer,
                pc.category_name, ps.current_stock_quantity, ps.warehouse_id
         FROM product_stock AS ps
                  LEFT JOIN product_sku AS sku ON sku.id = ps.product_sku_id
@@ -70,7 +72,7 @@
 
     <select id="getProductStock" resultType="com.wansenai.vo.report.ProductStockSkuVO" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
         SELECT ps.id, p.product_name, p.id AS productId, p.product_model, p.product_standard, p.product_color,sku.product_bar_code, p.product_weight, p.warehouse_shelves,
-        sku.product_unit, sku.retail_price AS unit_price, p.product_manufacturer,pc.category_name AS product_category_name,
+        sku.product_unit, sku.retail_price, sku.sale_price, sku.purchase_price, p.product_manufacturer,pc.category_name AS product_category_name,
         ps.current_stock_quantity AS current_stock, ps.init_stock_quantity AS initial_stock, w.warehouse_name, w.id AS warehouseId,
         ROUND((ps.current_stock_quantity * sku.retail_price), 2) AS stock_amount
         FROM product_stock AS ps
@@ -96,7 +98,7 @@
 
     <select id="getProductStockList" resultType="com.wansenai.vo.report.ProductStockSkuVO" parameterType="com.wansenai.dto.report.QueryProductStockDTO">
         SELECT ps.id, p.product_name, p.id AS productId, p.product_model, p.product_standard, p.product_color,sku.product_bar_code, p.product_weight, p.warehouse_shelves,
-        sku.product_unit, sku.retail_price AS unit_price, p.product_manufacturer,pc.category_name AS product_category_name,
+        sku.product_unit, sku.retail_price, sku.sale_price, sku.purchase_price, p.product_manufacturer,pc.category_name AS product_category_name,
         ps.current_stock_quantity AS current_stock, ps.init_stock_quantity AS initial_stock, w.warehouse_name, w.id AS warehouseId,
         ROUND((ps.current_stock_quantity * sku.retail_price), 2) AS stock_amount
         FROM product_stock AS ps
diff --git a/core/domain/src/main/java/com/wansenai/vo/product/ProductStockKeepUnitVO.java b/core/domain/src/main/java/com/wansenai/vo/product/ProductStockKeepUnitVO.java
index 81996a9a..a3726650 100644
--- a/core/domain/src/main/java/com/wansenai/vo/product/ProductStockKeepUnitVO.java
+++ b/core/domain/src/main/java/com/wansenai/vo/product/ProductStockKeepUnitVO.java
@@ -58,4 +58,10 @@ public class ProductStockKeepUnitVO {
 
     @JsonSerialize(using = BigDecimalSerializerBO.class)
     private BigDecimal retailPrice;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal salePrice;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal purchasePrice;
 }
diff --git a/core/domain/src/main/java/com/wansenai/vo/report/ProductStockSkuVO.java b/core/domain/src/main/java/com/wansenai/vo/report/ProductStockSkuVO.java
index a5a9ddd9..26de75c7 100644
--- a/core/domain/src/main/java/com/wansenai/vo/report/ProductStockSkuVO.java
+++ b/core/domain/src/main/java/com/wansenai/vo/report/ProductStockSkuVO.java
@@ -67,6 +67,15 @@ public class ProductStockSkuVO {
     @ExcelExport(value = "单价")
     private BigDecimal unitPrice;
 
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal retailPrice;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal salePrice;
+
+    @JsonSerialize(using = BigDecimalSerializerBO.class)
+    private BigDecimal purchasePrice;
+
     @JsonSerialize(using = BigDecimalSerializerBO.class)
     @ExcelExport(value = "初始库存")
     private BigDecimal initialStock;

From 3ef77bd5c905176761fb255be8f9b11903f169d6 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:44:28 +0800
Subject: [PATCH 02/12] fix: fix npe error in not fund member name

---
 .../wansenai/service/receipt/impl/ReceiptServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java
index 304bb770..3ceaa63a 100644
--- a/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java
+++ b/core/service/src/main/java/com/wansenai/service/receipt/impl/ReceiptServiceImpl.java
@@ -390,11 +390,11 @@ private Page<ReceiptVO> getReceiptRetailVOList(QueryReceiptDTO receiptDTO) {
 
         var receiptVos = new ArrayList<ReceiptVO>(receiptRetailVOList.getRecords().size() + 2);
         receiptRetailVOList.getRecords().forEach(item -> {
-            var member = memberService.lambdaQuery()
+            Optional<Member> memberOptional = Optional.ofNullable(memberService.lambdaQuery()
                     .eq(Member::getId, item.getMemberId())
                     .eq(Member::getDeleteFlag, CommonConstants.NOT_DELETED)
-                    .one();
-
+                    .one());
+            var memberName = memberOptional.map(Member::getMemberName).orElse("");
             var operator = userService.getById(item.getCreateBy());
 
             var productNumber = receiptRetailSubService.lambdaQuery()
@@ -406,7 +406,7 @@ private Page<ReceiptVO> getReceiptRetailVOList(QueryReceiptDTO receiptDTO) {
 
             ReceiptVO receiptVO = ReceiptVO.builder()
                     .id(item.getId())
-                    .name(Optional.ofNullable(member.getMemberName()).orElse(""))
+                    .name(memberName)
                     .receiptNumber(item.getReceiptNumber())
                     .receiptDate(item.getReceiptDate())
                     .operator(Optional.ofNullable(operator.getName()).orElse(""))

From 098bb40f33edc6ea6743427e2ac5995d1be41ee0 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:44:58 +0800
Subject: [PATCH 03/12] fix: allot stock business remove unitPrice and amount
 filed

---
 .../src/main/java/com/wansenai/bo/AllotStockBO.java |  6 ------
 .../warehouse/impl/AllotShipmentsServiceImpl.java   | 13 -------------
 2 files changed, 19 deletions(-)

diff --git a/core/domain/src/main/java/com/wansenai/bo/AllotStockBO.java b/core/domain/src/main/java/com/wansenai/bo/AllotStockBO.java
index 672bdce0..9107fb7e 100644
--- a/core/domain/src/main/java/com/wansenai/bo/AllotStockBO.java
+++ b/core/domain/src/main/java/com/wansenai/bo/AllotStockBO.java
@@ -53,11 +53,5 @@ public class AllotStockBO {
 
     private Integer productNumber;
 
-    @JsonSerialize(using = BigDecimalSerializerBO.class)
-    private BigDecimal unitPrice;
-
-    @JsonSerialize(using = BigDecimalSerializerBO.class)
-    private BigDecimal amount;
-
     private String remark;
 }
diff --git a/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java b/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java
index 3beaab4d..c238569f 100644
--- a/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java
+++ b/core/service/src/main/java/com/wansenai/service/warehouse/impl/AllotShipmentsServiceImpl.java
@@ -262,8 +262,6 @@ public Response<AllotReceiptDetailVO> getAllotReceiptDetail(Long id) {
                             .productStandard(product.getProductStandard())
                             .productModel(product.getProductModel())
                             .stock(product.getStock())
-                            .unitPrice(warehouseReceiptSub.getUnitPrice())
-                            .amount(warehouseReceiptSub.getTotalAmount())
                             .productNumber(warehouseReceiptSub.getProductNumber())
                             .remark(warehouseReceiptSub.getRemark())
                             .build();
@@ -287,12 +285,9 @@ public Response<String> addOrUpdateAllotReceipt(AllotReceiptDTO allotReceiptDTO)
         var isUpdate = allotReceiptDTO.getId() != null;
 
         var totalProductNumber = 0;
-        var totalAmount = BigDecimal.ZERO;
-
         if(!allotReceiptDTO.getTableData().isEmpty()) {
             for (AllotStockBO stockBO : allotReceiptDTO.getTableData()) {
                 totalProductNumber += stockBO.getProductNumber();
-                totalAmount = totalAmount.add(stockBO.getAmount());
             }
         }
 
@@ -326,7 +321,6 @@ public Response<String> addOrUpdateAllotReceipt(AllotReceiptDTO allotReceiptDTO)
                     .eq(WarehouseReceiptMain::getId, allotReceiptDTO.getId())
                     .set(allotReceiptDTO.getStatus() != null, WarehouseReceiptMain::getStatus, allotReceiptDTO.getStatus())
                     .set(WarehouseReceiptMain::getTotalProductNumber, totalProductNumber)
-                    .set(WarehouseReceiptMain::getTotalAmount, totalAmount)
                     .set(StringUtils.hasLength(allotReceiptDTO.getReceiptDate()), WarehouseReceiptMain::getReceiptDate, allotReceiptDTO.getReceiptDate())
                     .set(StringUtils.hasLength(allotReceiptDTO.getRemark()), WarehouseReceiptMain::getRemark, allotReceiptDTO.getRemark())
                     .set(StringUtils.hasLength(fileIds), WarehouseReceiptMain::getFileId, fileIds)
@@ -348,8 +342,6 @@ public Response<String> addOrUpdateAllotReceipt(AllotReceiptDTO allotReceiptDTO)
                             .otherWarehouseId(item.getOtherWarehouseId())
                             .productBarcode(item.getBarCode())
                             .productNumber(item.getProductNumber())
-                            .unitPrice(item.getUnitPrice())
-                            .totalAmount(item.getAmount())
                             .remark(item.getRemark())
                             .createBy(userId)
                             .createTime(LocalDateTime.now())
@@ -392,8 +384,6 @@ public Response<String> addOrUpdateAllotReceipt(AllotReceiptDTO allotReceiptDTO)
                             .otherWarehouseId(item.getOtherWarehouseId())
                             .productBarcode(item.getBarCode())
                             .productNumber(item.getProductNumber())
-                            .unitPrice(item.getUnitPrice())
-                            .totalAmount(item.getAmount())
                             .remark(item.getRemark())
                             .createBy(userId)
                             .createTime(LocalDateTime.now())
@@ -408,7 +398,6 @@ public Response<String> addOrUpdateAllotReceipt(AllotReceiptDTO allotReceiptDTO)
                     .type("调拨出库")
                     .initReceiptNumber(allotReceiptDTO.getReceiptNumber())
                     .receiptDate(TimeUtil.parse(allotReceiptDTO.getReceiptDate()))
-                    .totalAmount(totalAmount)
                     .totalProductNumber(totalProductNumber)
                     .remark(allotReceiptDTO.getRemark())
                     .fileId(fileIds)
@@ -499,8 +488,6 @@ public void exportAllotReceipt(QueryAllotReceiptDTO queryAllotReceiptDTO, HttpSe
                                     .productUnit(item.getProductUnit())
                                     .stock(item.getStock())
                                     .productNumber(item.getProductNumber())
-                                    .unitPrice(item.getUnitPrice())
-                                    .amount(item.getAmount())
                                     .remark(item.getRemark())
                                     .build();
                             subData.add(allotStockBo);

From e74dfc1b907c7480f32ed205c56a8f2a072f1af6 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:46:08 +0800
Subject: [PATCH 04/12] fix: add warehouse id filed in other shipments model

---
 web/src/api/warehouse/model/shipmentsModel.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/api/warehouse/model/shipmentsModel.ts b/web/src/api/warehouse/model/shipmentsModel.ts
index a4e0eb51..db33aa94 100644
--- a/web/src/api/warehouse/model/shipmentsModel.ts
+++ b/web/src/api/warehouse/model/shipmentsModel.ts
@@ -2,6 +2,7 @@ import {FileData} from "@/api/financial/model/advanceModel";
 
 export interface OtherShipmentsData {
     id: number | string;
+    warehouseId: number | string;
     customerId: number | string;
     warehouseName: string;
     barCode: string;

From 7bf76dd9ad68d9c8eaf70c66eab930ec797235f2 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:47:04 +0800
Subject: [PATCH 05/12] fix: add different prices to different businesses

---
 web/src/api/product/model/productModel.ts | 3 +++
 web/src/api/purchase/model/orderModel.ts  | 1 +
 web/src/api/sale/model/orderModel.ts      | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/src/api/product/model/productModel.ts b/web/src/api/product/model/productModel.ts
index f6a18114..dd31e376 100644
--- a/web/src/api/product/model/productModel.ts
+++ b/web/src/api/product/model/productModel.ts
@@ -129,6 +129,9 @@ export interface ProductStockSkuResp {
     warehouseShelves: string;
     productWeight: number;
     unitPrice: number;
+    retailPrice: number;
+    salePrice: number;
+    purchasePrice: number;
     initialStock: number;
     currentStock: number;
     stockAmount: number;
diff --git a/web/src/api/purchase/model/orderModel.ts b/web/src/api/purchase/model/orderModel.ts
index 6861deb4..0fd1f631 100644
--- a/web/src/api/purchase/model/orderModel.ts
+++ b/web/src/api/purchase/model/orderModel.ts
@@ -19,6 +19,7 @@ export interface PurchaseData {
     stock: number;
     productNumber: number;
     unitPrice: number;
+    purchasePrice: number;
     amount: number;
     taxRate: number;
     taxAmount: number;
diff --git a/web/src/api/sale/model/orderModel.ts b/web/src/api/sale/model/orderModel.ts
index e4274877..6fea523e 100644
--- a/web/src/api/sale/model/orderModel.ts
+++ b/web/src/api/sale/model/orderModel.ts
@@ -19,7 +19,7 @@ export interface SalesData {
     productStandard: string;
     stock: number;
     productNumber: number;
-    retailPrice: number;
+    salePrice: number;
     amount: number;
     taxRate: number;
     taxAmount: number;

From 39bf176802d3b013e9e740712de1dac15fed4877 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:47:34 +0800
Subject: [PATCH 06/12] fetch: Select product view to add purchase price and
 sales price fields

---
 web/src/views/product/info/info.data.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/web/src/views/product/info/info.data.ts b/web/src/views/product/info/info.data.ts
index f73fe48d..7e6351dc 100644
--- a/web/src/views/product/info/info.data.ts
+++ b/web/src/views/product/info/info.data.ts
@@ -168,6 +168,16 @@ const extendPriceColumn: BasicColumn[] = [
         dataIndex: 'retailPrice',
         width: 60,
     },
+    {
+        title: '销售价',
+        dataIndex: 'salePrice',
+        width: 60,
+    },
+    {
+        title: '采购价',
+        dataIndex: 'purchasePrice',
+        width: 60,
+    },
     {
         title: '扩展信息',
         dataIndex: 'extendInfo',

From f576a91f2bbf0ba8c291c539c87f69ac0e5d6b84 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:48:33 +0800
Subject: [PATCH 07/12] fetch: remove allot basic column totalAmount filed and
 assemble and disassemble business update file

---
 .../addEditAssembleOrDisassemble.data.ts          |  2 +-
 .../views/warehouse/allot/allotShipments.data.ts  | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/web/src/views/warehouse/addEditAssembleOrDisassemble.data.ts b/web/src/views/warehouse/addEditAssembleOrDisassemble.data.ts
index 20e6fc87..8a40b10c 100644
--- a/web/src/views/warehouse/addEditAssembleOrDisassemble.data.ts
+++ b/web/src/views/warehouse/addEditAssembleOrDisassemble.data.ts
@@ -112,7 +112,7 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
             editRender: { name: '$input', props: { type: 'number', min: 1, max: 9999 } }, },
         {
             field: 'unitPrice',
-            title: '单价', width:90,
+            title: '采购价', width:90,
             formatter ({ cellValue }) {
                 return cellValue ? `￥${XEUtils.commafy(XEUtils.toNumber(cellValue), { digits: 2 })}` : ''
             },
diff --git a/web/src/views/warehouse/allot/allotShipments.data.ts b/web/src/views/warehouse/allot/allotShipments.data.ts
index 1e769c9a..d396761c 100644
--- a/web/src/views/warehouse/allot/allotShipments.data.ts
+++ b/web/src/views/warehouse/allot/allotShipments.data.ts
@@ -23,11 +23,6 @@ export const columns: BasicColumn[] = [
         dataIndex: 'productNumber',
         width: 100,
     },
-    {
-        title: '金额合计',
-        dataIndex: 'totalAmount',
-        width: 70,
-    },
     {
         title: '操作员',
         dataIndex: 'operator',
@@ -155,16 +150,6 @@ export const allotShipmentTableColumns: BasicColumn[] = [
         dataIndex: 'productNumber',
         width: 70,
     },
-    {
-        title: '单价',
-        dataIndex: 'unitPrice',
-        width: 70,
-    },
-    {
-        title: '金额',
-        dataIndex: 'amount',
-        width: 70,
-    },
     {
         title: '备注',
         dataIndex: 'remark',

From 824e48fe45dc0fe516a62f1386fc905b1ade1649 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:48:45 +0800
Subject: [PATCH 08/12] fetch: add title Prefix

---
 web/src/views/warehouse/addEditStorageShipments.data.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/src/views/warehouse/addEditStorageShipments.data.ts b/web/src/views/warehouse/addEditStorageShipments.data.ts
index f494dffe..819fb806 100644
--- a/web/src/views/warehouse/addEditStorageShipments.data.ts
+++ b/web/src/views/warehouse/addEditStorageShipments.data.ts
@@ -110,6 +110,7 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         {
             field: 'unitPrice',
             title: '单价', width:90,
+            titlePrefix: { content: '其他入/出库没有单价信息，若需要可自行修改' },
             formatter ({ cellValue }) {
                 return cellValue ? `￥${XEUtils.commafy(XEUtils.toNumber(cellValue), { digits: 2 })}` : ''
             },
@@ -119,6 +120,7 @@ const gridOptions = reactive<VxeGridProps<RowVO>>({
         {
             field: 'amount',
             title: '金额', width:90,
+            titlePrefix: { content: '其他入/出库没有金额信息，若需要可自行修改' },
             formatter ({ cellValue }) {
                 return cellValue ? `￥${XEUtils.commafy(XEUtils.toNumber(cellValue), { digits: 2 })}` : ''
             },

From a07edc5c14d9148a5e088b098bf79cb34922d71b Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:50:00 +0800
Subject: [PATCH 09/12] fix: Fix bugs in inventory deduction and price
 corresponding business data for warehouse module

---
 .../components/AddEditAllotShipmentsModal.vue |  65 ++-------
 .../components/AddEditAssembleModal.vue       | 128 +++++++++++++-----
 .../components/AddEditDisassembleModal.vue    | 117 ++++++++++++----
 .../components/AddEditOtherShipmentsModal.vue |  17 ++-
 .../components/AddEditOtherStorageModal.vue   |   5 +-
 5 files changed, 213 insertions(+), 119 deletions(-)

diff --git a/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue b/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue
index d445b3a2..382fe32d 100644
--- a/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue
+++ b/web/src/views/warehouse/allot/components/AddEditAllotShipmentsModal.vue
@@ -66,13 +66,7 @@
                   <vxe-select v-model="row.barCode" placeholder="输入商品条码" @change="selectBarCode" :options="productLabelList" clearable filterable></vxe-select>
                 </template>
                 <template #product_number_edit="{ row }">
-                  <vxe-input v-model="row.productNumber" @change="productNumberChange"></vxe-input>
-                </template>
-                <template #price_edit="{ row }">
-                  <vxe-input v-model="row.unitPrice" @change="unitPriceChange"></vxe-input>
-                </template>
-                <template #amount_edit="{ row }">
-                  <vxe-input v-model="row.amount"  @change="amountChange"></vxe-input>
+                  <vxe-input v-model="row.productNumber" ></vxe-input>
                 </template>
               </vxe-grid>
             </div>
@@ -302,8 +296,6 @@ export default defineComponent({
               selectRow.row.productStandard = product.productStandard
               selectRow.row.productUnit = product.productUnit
               selectRow.row.stock = product.currentStock
-              selectRow.row.unitPrice = product.unitPrice
-              selectRow.row.amount = product.unitPrice
               selectRow.row.productNumber = 1
               table.updateData(selectRow.rowIndex, selectRow.row)
             } else {
@@ -354,8 +346,6 @@ export default defineComponent({
               stock: item.stock,
               productUnit: item.productUnit,
               productNumber: item.productNumber,
-              unitPrice: item.unitPrice,
-              amount: item.amount,
               remark: item.remark,
             };
             table.insert(tableData)
@@ -388,6 +378,16 @@ export default defineComponent({
         }
       }
 
+      const tableData = table.getTableData().tableData
+      const isStockNotEnough = tableData.some(item => item.productNumber > item.stock)
+      if(isStockNotEnough) {
+        const tableDataNotEnough = tableData.filter(item => item.productNumber > item.stock)
+        const tableDataNotEnoughBarCode = tableDataNotEnough.map(item => item.barCode)
+        const tableDataNotEnoughBarCodeStr = tableDataNotEnoughBarCode.join(",")
+        createMessage.info("条码: "+tableDataNotEnoughBarCodeStr +"商品库存不足，请检查库存数量")
+        return;
+      }
+
       const files :any = [];
       if (fileList && fileList.value) {
         for (let i = 0; i < fileList.value.length; i++) {
@@ -425,8 +425,6 @@ export default defineComponent({
           stock: item.stock,
           productUnit: item.productUnit,
           productNumber: item.productNumber,
-          unitPrice: item.unitPrice,
-          amount: item.amount,
           remark: item.remark,
         }
         dataArray.push(data)
@@ -531,8 +529,6 @@ export default defineComponent({
               if (index > -1) {
                 const row = tableData[index]
                 row.productNumber = Number(row.productNumber) + 1
-                row.amount = row.productNumber * row.unitPrice
-                row.amount = Number(row.amount.toFixed(2))
                 table.updateData()
               } else {
                 const tableData : any = {
@@ -545,8 +541,6 @@ export default defineComponent({
                   productUnit: shipmentsData.productUnit,
                   stock: shipmentsData.stock,
                   productNumber: 1,
-                  amount: shipmentsData.retailPrice,
-                  unitPrice: shipmentsData.retailPrice,
                 };
                 table.insert(tableData)
               }
@@ -562,42 +556,20 @@ export default defineComponent({
       const table = xGrid.value
       if(table) {
         data = data.map(item => {
-          item.unitPrice = item.retailPrice
+          item.warehouseId = allotShipmentsFormState.warehouseId
           item.productNumber = 1
-          item.amount = item.retailPrice * item.productNumber
           return item
         })
         table.insert(data)
       }
     }
 
-
     function productModal() {
       openProductModal(true, {
         isUpdate: false,
       });
     }
 
-    function productNumberChange() {
-      const table = xGrid.value
-      if(table) {
-        const data = table.getEditRecord().row;
-        data.amount = data.productNumber * data.unitPrice
-        data.amount = Number(data.amount.toFixed(2))
-        table.updateData()
-      }
-    }
-
-    function unitPriceChange() {
-      const table = xGrid.value
-      if(table) {
-        const data = table.getEditRecord().row;
-        data.amount = data.unitPrice * data.productNumber
-        data.amount = Number(data.amount.toFixed(2))
-        table.updateData()
-      }
-    }
-
     function addRowData() {
       const table = xGrid.value
       const defaultWarehouse = warehouseList.value.find(item => item.isDefault === 1)
@@ -607,16 +579,6 @@ export default defineComponent({
       }
     }
 
-    function amountChange() {
-      const table = xGrid.value
-      if(table) {
-        const data = table.getEditRecord().row;
-        data.unitPrice = data.amount / data.productNumber
-        data.unitPrice = Number(data.unitPrice.toFixed(2))
-        table.updateData()
-      }
-    }
-
     return {
       h,
       AccountBookTwoTone,
@@ -655,9 +617,6 @@ export default defineComponent({
       selectProductModal,
       productModal,
       handleCheckSuccess,
-      productNumberChange,
-      unitPriceChange,
-      amountChange,
       addRowData,
       productList,
       productLabelList,
diff --git a/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue b/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue
index 7c9d4c45..f4ba9654 100644
--- a/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue
+++ b/web/src/views/warehouse/assemble/components/AddEditAssembleModal.vue
@@ -42,8 +42,8 @@
                   <a-input v-if="showScanPressEnter" placeholder="鼠标点击此处扫条码" style="width: 150px; margin-right: 10px" v-model:value="barCode"
                            @pressEnter="scanPressEnter" ref="scanBarCode"/>
                   <a-button v-if="showScanPressEnter" style="margin-right: 10px" @click="stopScan">收起扫码</a-button>
-<!--                  <a-button @click="productModal" style="margin-right: 10px">选择添加商品</a-button>-->
-                  <a-button @click="addRowSubData" style="margin-right: 10px">插入一行</a-button>
+                  <a-button @click="productModal" style="margin-right: 10px">选择添加组装商品</a-button>
+                  <a-button @click="addRowSubData" style="margin-right: 10px">添加一行</a-button>
                   <a-button @click="deleteRowData" style="margin-right: 10px">删除选中行</a-button>
                 </template>
                 <template #warehouseId_default="{ row }">
@@ -55,7 +55,7 @@
                   </vxe-select>
                 </template>
                 <template #barCode_edit="{ row }">
-                  <vxe-input type="search" clearable @search-click="productModal" v-model="row.barCode"></vxe-input>
+                  <vxe-select v-model="row.barCode" placeholder="输入商品条码" @change="selectBarCode" :options="productLabelList" clearable filterable></vxe-select>
                 </template>
                 <template #product_number_edit="{ row }">
                   <vxe-input v-model="row.productNumber" @change="productNumberChange"></vxe-input>
@@ -144,8 +144,9 @@ import weekday from "dayjs/plugin/weekday";
 import localeData from "dayjs/plugin/localeData";
 import {WarehouseResp} from "@/api/basic/model/warehouseModel";
 import {getDefaultWarehouse, getWarehouseList} from "@/api/basic/warehouse";
-import {getProductSkuByBarCode} from "@/api/product/product";
+import {getProductSkuByBarCode, getProductStockSku} from "@/api/product/product";
 import SelectProductModal from "@/views/product/info/components/SelectProductModal.vue";
+import {ProductStockSkuResp} from "@/api/product/model/productModel";
 const VNodes = {
   props: {
     vnodes: {
@@ -220,6 +221,8 @@ export default defineComponent({
     });
     const barCode = ref('');
     const warehouseList = ref<WarehouseResp[]>([]);
+    const productList = ref<ProductStockSkuResp[]>([]);
+    const productLabelList = ref<any[]>([]);
 
     function handleCancelModal() {
       close();
@@ -231,7 +234,7 @@ export default defineComponent({
     function openAddEditModal(id: string | undefined) {
       open.value = true
       loadWarehouseList();
-      loadDefaultWarehouse();
+      loadProductSku();
       if (id) {
         title.value = '编辑-组装单'
         loadAssembleReceipt(id);
@@ -243,21 +246,66 @@ export default defineComponent({
       }
     }
 
-    function loadDefaultWarehouse() {
-      getDefaultWarehouse().then(res => {
-        const data = res.data
-        if(data) {
-          assembleFormState.warehouseId = data.id
+    function loadWarehouseList() {
+      getWarehouseList().then(res => {
+        const {columns} = gridOptions
+        if (columns) {
+          const warehouseColumn = columns[2]
+          warehouseColumn.editRender.options = [];
+          if (warehouseColumn && warehouseColumn.editRender) {
+            warehouseColumn.editRender.options?.push(...res.data.map(item => ({value: item.id, label: item.warehouseName})))
+          }
+          warehouseList.value = res.data
+        }
+        const defaultWarehouse = res.data.find(item => item.isDefault === 1)
+        if(defaultWarehouse) {
+          assembleFormState.warehouseId = defaultWarehouse.id
+        } else {
+          assembleFormState.warehouseId = res.data[0].id
         }
       })
     }
 
-    function loadWarehouseList() {
-      getWarehouseList().then(res => {
-        warehouseList.value = res.data
+    function loadProductSku() {
+      getProductStockSku().then(res => {
+        productList.value = res.data
+        productLabelList.value.push(...res.data.map(item => ({value: item.productBarcode, label: item.productBarcode})))
+        productLabelList.value = productLabelList.value.filter((item, index, arr) => {
+          return arr.findIndex(item1 => item1.value === item.value) === index
+        })
       })
     }
 
+    function selectBarCode() {
+      const table = xGrid.value
+      const selectRow = table?.getActiveRecord()
+      if(selectRow) {
+        const {columns} = gridOptions
+        if (columns) {
+          const barCodeColumn = selectRow.row.barCode
+          const warehouseColumn = selectRow.row.warehouseId
+          if(barCodeColumn && warehouseColumn) {
+            const product = productList.value.find(item => {
+              return item.productBarcode === barCodeColumn && item.warehouseId === warehouseColumn;
+            });
+            if (product) {
+              selectRow.row.productId = product.productId
+              selectRow.row.productName = product.productName
+              selectRow.row.productStandard = product.productStandard
+              selectRow.row.productUnit = product.productUnit
+              selectRow.row.stock = product.currentStock
+              selectRow.row.unitPrice = product.purchasePrice
+              selectRow.row.amount = product.purchasePrice
+              selectRow.row.productNumber = 1
+              table.updateData(selectRow.rowIndex, selectRow.row)
+            } else {
+              createMessage.warn("该条码查询不到商品信息")
+            }
+          }
+        }
+      }
+    }
+
     function loadGenerateId() {
       generateId("组装单").then(res => {
         assembleFormState.receiptNumber = res.data
@@ -342,6 +390,21 @@ export default defineComponent({
           createMessage.error("请添加一行数据")
           return;
         }
+        const isBarCodeEmpty = insertRecords.some(item => !item.barCode)
+        if(isBarCodeEmpty) {
+          createMessage.warn("请录入条码或者选择产品")
+          return;
+        }
+      }
+
+      const tableData = table.getTableData().tableData
+      const isStockNotEnough = tableData.some(item => item.productNumber > item.stock)
+      if(isStockNotEnough) {
+        const tableDataNotEnough = tableData.filter(item => item.productNumber > item.stock)
+        const tableDataNotEnoughBarCode = tableDataNotEnough.map(item => item.barCode)
+        const tableDataNotEnoughBarCodeStr = tableDataNotEnoughBarCode.join(",")
+        createMessage.info("条码: "+tableDataNotEnoughBarCodeStr +"商品库存不足，请检查库存数量")
+        return;
       }
 
       const files :any = [];
@@ -478,12 +541,11 @@ export default defineComponent({
         if (columns) {
           const {data} = res
           if (data) {
-            const shipmentsData : any = data
+            const assembleData : any = data
             const table = xGrid.value
-            console.info(shipmentsData)
             if (table) {
               const tableData = table.getTableData().tableData
-              const index = tableData.findIndex(item => item.barCode === shipmentsData.barCode)
+              const index = tableData.findIndex(item => item.barCode === assembleData.barCode)
               if (index > -1) {
                 const row = tableData[index]
                 row.productNumber = Number(row.productNumber) + 1
@@ -493,16 +555,16 @@ export default defineComponent({
               } else {
                 const tableData : any = {
                   type: "普通子件",
-                  warehouseId: shipmentsData.warehouseId,
-                  productId: shipmentsData.productId,
-                  barCode: shipmentsData.barCode,
-                  productName: shipmentsData.productName,
-                  productStandard: shipmentsData.productStandard,
-                  productUnit: shipmentsData.productUnit,
-                  stock: shipmentsData.stock,
+                  warehouseId: assembleData.warehouseId,
+                  productId: assembleData.productId,
+                  barCode: assembleData.barCode,
+                  productName: assembleData.productName,
+                  productStandard: assembleData.productStandard,
+                  productUnit: assembleData.productUnit,
+                  stock: assembleData.stock,
                   productNumber: 1,
-                  amount: shipmentsData.retailPrice,
-                  unitPrice: shipmentsData.retailPrice,
+                  amount: assembleData.purchasePrice,
+                  unitPrice: assembleData.purchasePrice,
                 };
                 table.insert(tableData)
               }
@@ -528,8 +590,8 @@ export default defineComponent({
           tableData.productStandard = data[0].productStandard
           tableData.productUnit = data[0].productUnit
           tableData.stock = data[0].stock
-          tableData.unitPrice = data[0].retailPrice
-          tableData.amount = data[0].retailPrice
+          tableData.unitPrice = data[0].purchasePrice
+          tableData.amount = data[0].purchasePrice
           tableData.productNumber = 1
           table.updateData()
         } else {
@@ -544,8 +606,8 @@ export default defineComponent({
               productUnit: item.productUnit,
               stock: item.stock,
               productNumber: 1,
-              amount: item.retailPrice,
-              unitPrice: item.retailPrice,
+              amount: item.purchasePrice,
+              unitPrice: item.purchasePrice,
             };
             // 如果获取data的下标
             if (data.indexOf(item) === 0) {
@@ -557,8 +619,8 @@ export default defineComponent({
               tableData.productStandard = item.productStandard
               tableData.productUnit = item.productUnit
               tableData.stock = item.stock
-              tableData.unitPrice = item.retailPrice
-              tableData.amount = item.retailPrice
+              tableData.unitPrice = item.purchasePrice
+              tableData.amount = item.purchasePrice
               tableData.productNumber = 1
               table.updateData()
             } else {
@@ -653,7 +715,9 @@ export default defineComponent({
       productNumberChange,
       unitPriceChange,
       amountChange,
-      addRowSubData
+      addRowSubData,
+      selectBarCode,
+      productLabelList
     };
   },
 });
diff --git a/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue b/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue
index 042ed5ec..be7560f5 100644
--- a/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue
+++ b/web/src/views/warehouse/disassemble/components/AddEditDisassembleModal.vue
@@ -42,7 +42,7 @@
                   <a-input v-if="showScanPressEnter" placeholder="鼠标点击此处扫条码" style="width: 150px; margin-right: 10px" v-model:value="barCode"
                            @pressEnter="scanPressEnter" ref="scanBarCode"/>
                   <a-button v-if="showScanPressEnter" style="margin-right: 10px" @click="stopScan">收起扫码</a-button>
-                  <a-button @click="addRowSubData" style="margin-right: 10px">插入一行</a-button>
+                  <a-button @click="addRowSubData" style="margin-right: 10px">添加一行</a-button>
                   <a-button @click="deleteRowData" style="margin-right: 10px">删除选中行</a-button>
                 </template>
                 <template #warehouseId_default="{ row }">
@@ -54,7 +54,7 @@
                   </vxe-select>
                 </template>
                 <template #barCode_edit="{ row }">
-                  <vxe-input type="search" clearable @search-click="productModal" v-model="row.barCode"></vxe-input>
+                  <vxe-select v-model="row.barCode" placeholder="输入商品条码" @change="selectBarCode" :options="productLabelList" clearable filterable></vxe-select>
                 </template>
                 <template #product_number_edit="{ row }">
                   <vxe-input v-model="row.productNumber" @change="productNumberChange"></vxe-input>
@@ -132,7 +132,7 @@ import {
   disAssembleFormState,
   xGrid,
   tableData,
-  gridOptions, assembleFormState,
+  gridOptions,
 } from '/src/views/warehouse/addEditAssembleOrDisassemble.data';
 import {useModal} from "@/components/Modal";
 import {generateId, uploadOss} from "@/api/basic/common";
@@ -142,9 +142,10 @@ import { addOrUpdateDisAssemble, getDisAssembleDetailById} from "@/api/warehouse
 import weekday from "dayjs/plugin/weekday";
 import localeData from "dayjs/plugin/localeData";
 import {WarehouseResp} from "@/api/basic/model/warehouseModel";
-import {getDefaultWarehouse, getWarehouseList} from "@/api/basic/warehouse";
-import {getProductSkuByBarCode} from "@/api/product/product";
+import {getWarehouseList} from "@/api/basic/warehouse";
+import {getProductSkuByBarCode, getProductStockSku} from "@/api/product/product";
 import SelectProductModal from "@/views/product/info/components/SelectProductModal.vue";
+import {ProductStockSkuResp} from "@/api/product/model/productModel";
 const VNodes = {
   props: {
     vnodes: {
@@ -219,6 +220,8 @@ export default defineComponent({
     });
     const barCode = ref('');
     const warehouseList = ref<WarehouseResp[]>([]);
+    const productList = ref<ProductStockSkuResp[]>([]);
+    const productLabelList = ref<any[]>([]);
 
     function handleCancelModal() {
       close();
@@ -230,7 +233,7 @@ export default defineComponent({
     function openAddEditModal(id: string | undefined) {
       open.value = true
       loadWarehouseList();
-      loadDefaultWarehouse();
+      loadProductSku();
       if (id) {
         title.value = '编辑-拆卸单'
         loadDisAssembleReceipt(id);
@@ -242,21 +245,67 @@ export default defineComponent({
       }
     }
 
-    function loadDefaultWarehouse() {
-      getDefaultWarehouse().then(res => {
-        const data = res.data
-        if(data) {
-          disAssembleFormState.warehouseId = data.id
+
+    function loadWarehouseList() {
+      getWarehouseList().then(res => {
+        const {columns} = gridOptions
+        if (columns) {
+          const warehouseColumn = columns[2]
+          warehouseColumn.editRender.options = [];
+          if (warehouseColumn && warehouseColumn.editRender) {
+            warehouseColumn.editRender.options?.push(...res.data.map(item => ({value: item.id, label: item.warehouseName})))
+          }
+          warehouseList.value = res.data
+        }
+        const defaultWarehouse = res.data.find(item => item.isDefault === 1)
+        if(defaultWarehouse) {
+          disAssembleFormState.warehouseId = defaultWarehouse.id
+        } else {
+          disAssembleFormState.warehouseId = res.data[0].id
         }
       })
     }
 
-    function loadWarehouseList() {
-      getWarehouseList().then(res => {
-        warehouseList.value = res.data
+    function loadProductSku() {
+      getProductStockSku().then(res => {
+        productList.value = res.data
+        productLabelList.value.push(...res.data.map(item => ({value: item.productBarcode, label: item.productBarcode})))
+        productLabelList.value = productLabelList.value.filter((item, index, arr) => {
+          return arr.findIndex(item1 => item1.value === item.value) === index
+        })
       })
     }
 
+    function selectBarCode() {
+      const table = xGrid.value
+      const selectRow = table?.getActiveRecord()
+      if(selectRow) {
+        const {columns} = gridOptions
+        if (columns) {
+          const barCodeColumn = selectRow.row.barCode
+          const warehouseColumn = selectRow.row.warehouseId
+          if(barCodeColumn && warehouseColumn) {
+            const product = productList.value.find(item => {
+              return item.productBarcode === barCodeColumn && item.warehouseId === warehouseColumn;
+            });
+            if (product) {
+              selectRow.row.productId = product.productId
+              selectRow.row.productName = product.productName
+              selectRow.row.productStandard = product.productStandard
+              selectRow.row.productUnit = product.productUnit
+              selectRow.row.stock = product.currentStock
+              selectRow.row.unitPrice = product.purchasePrice
+              selectRow.row.amount = product.purchasePrice
+              selectRow.row.productNumber = 1
+              table.updateData(selectRow.rowIndex, selectRow.row)
+            } else {
+              createMessage.warn("该条码查询不到商品信息")
+            }
+          }
+        }
+      }
+    }
+
     function loadGenerateId() {
       generateId("拆卸单").then(res => {
         disAssembleFormState.receiptNumber = res.data
@@ -269,7 +318,7 @@ export default defineComponent({
       if(table) {
         const tableData : any = {
           type: "组合件",
-          warehouseId: assembleFormState.warehouseId,
+          warehouseId: disAssembleFormState.warehouseId,
           productId: '',
           barCode: '',
           productName: '',
@@ -341,6 +390,21 @@ export default defineComponent({
           createMessage.error("请添加一行数据")
           return;
         }
+        const isBarCodeEmpty = insertRecords.some(item => !item.barCode)
+        if(isBarCodeEmpty) {
+          createMessage.warn("请录入条码或者选择产品")
+          return;
+        }
+      }
+
+      const tableData = table.getTableData().tableData
+      const isStockNotEnough = tableData.some(item => item.productNumber > item.stock)
+      if(isStockNotEnough) {
+        const tableDataNotEnough = tableData.filter(item => item.productNumber > item.stock)
+        const tableDataNotEnoughBarCode = tableDataNotEnough.map(item => item.barCode)
+        const tableDataNotEnoughBarCodeStr = tableDataNotEnoughBarCode.join(",")
+        createMessage.info("条码: "+tableDataNotEnoughBarCodeStr +"商品库存不足，请检查库存数量")
+        return;
       }
 
       const files :any = [];
@@ -500,8 +564,8 @@ export default defineComponent({
                   productUnit: shipmentsData.productUnit,
                   stock: shipmentsData.stock,
                   productNumber: 1,
-                  amount: shipmentsData.retailPrice,
-                  unitPrice: shipmentsData.retailPrice,
+                  amount: shipmentsData.purchasePrice,
+                  unitPrice: shipmentsData.purchasePrice,
                 };
                 table.insert(tableData)
               }
@@ -527,8 +591,8 @@ export default defineComponent({
           tableData.productStandard = data[0].productStandard
           tableData.productUnit = data[0].productUnit
           tableData.stock = data[0].stock
-          tableData.unitPrice = data[0].retailPrice
-          tableData.amount = data[0].retailPrice
+          tableData.unitPrice = data[0].purchasePrice
+          tableData.amount = data[0].purchasePrice
           tableData.productNumber = 1
           table.updateData()
         } else {
@@ -543,8 +607,8 @@ export default defineComponent({
               productUnit: item.productUnit,
               stock: item.stock,
               productNumber: 1,
-              amount: item.retailPrice,
-              unitPrice: item.retailPrice,
+              amount: item.purchasePrice,
+              unitPrice: item.purchasePrice,
             };
             // 如果获取data的下标
             if (data.indexOf(item) === 0) {
@@ -556,8 +620,8 @@ export default defineComponent({
               tableData.productStandard = item.productStandard
               tableData.productUnit = item.productUnit
               tableData.stock = item.stock
-              tableData.unitPrice = item.retailPrice
-              tableData.amount = item.retailPrice
+              tableData.unitPrice = item.purchasePrice
+              tableData.amount = item.purchasePrice
               tableData.productNumber = 1
               table.updateData()
             } else {
@@ -609,7 +673,7 @@ export default defineComponent({
     function addRowSubData() {
       const table = xGrid.value
       if(table) {
-        table.insertAt({type: "普通子件", warehouseId: assembleFormState.warehouseId}, -1)
+        table.insertAt({type: "普通子件", warehouseId: disAssembleFormState.warehouseId}, -1)
       }
     }
 
@@ -653,7 +717,10 @@ export default defineComponent({
       productNumberChange,
       unitPriceChange,
       amountChange,
-      addRowSubData
+      addRowSubData,
+      loadProductSku,
+      selectBarCode,
+      productLabelList
     };
   },
 });
diff --git a/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue b/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue
index 97b2e35f..eadd7f68 100644
--- a/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue
+++ b/web/src/views/warehouse/shipments/components/AddEditOtherShipmentsModal.vue
@@ -167,7 +167,7 @@ import weekday from "dayjs/plugin/weekday";
 import localeData from "dayjs/plugin/localeData";
 import {CustomerResp} from "@/api/basic/model/customerModel";
 import {WarehouseResp} from "@/api/basic/model/warehouseModel";
-import {getDefaultWarehouse, getWarehouseList} from "@/api/basic/warehouse";
+import {getWarehouseList} from "@/api/basic/warehouse";
 import {getProductSkuByBarCode, getProductStockSku} from "@/api/product/product";
 import SelectProductModal from "@/views/product/info/components/SelectProductModal.vue";
 import CustomerModal from "@/views/basic/customer/components/CustomerModal.vue";
@@ -411,6 +411,16 @@ export default defineComponent({
           return;
         }
       }
+      // 库存校验
+      const tableData = table.getTableData().tableData
+      const isStockNotEnough = tableData.some(item => item.productNumber > item.stock)
+      if(isStockNotEnough) {
+        const tableDataNotEnough = tableData.filter(item => item.productNumber > item.stock)
+        const tableDataNotEnoughBarCode = tableDataNotEnough.map(item => item.barCode)
+        const tableDataNotEnoughBarCodeStr = tableDataNotEnoughBarCode.join(",")
+        createMessage.info("条码: "+tableDataNotEnoughBarCodeStr +"商品库存不足，请检查库存数量")
+        return;
+      }
 
       const files :any = [];
       if (fileList && fileList.value) {
@@ -577,8 +587,6 @@ export default defineComponent({
                   productUnit: shipmentsData.productUnit,
                   stock: shipmentsData.stock,
                   productNumber: 1,
-                  amount: shipmentsData.retailPrice,
-                  unitPrice: shipmentsData.retailPrice,
                 };
                 table.insert(tableData)
               }
@@ -594,9 +602,8 @@ export default defineComponent({
       const table = xGrid.value
       if(table) {
         data = data.map(item => {
-          item.unitPrice = item.retailPrice
+          item.warehouseId = otherShipmentFormState.warehouseId
           item.productNumber = 1
-          item.amount = item.retailPrice * item.productNumber
           return item
         })
         table.insert(data)
diff --git a/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue b/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue
index 4ea2be92..2c5f5d2a 100644
--- a/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue
+++ b/web/src/views/warehouse/storage/components/AddEditOtherStorageModal.vue
@@ -568,8 +568,6 @@ export default defineComponent({
                   productUnit: storageData.productUnit,
                   stock: storageData.stock,
                   productNumber: 1,
-                  amount: storageData.retailPrice,
-                  unitPrice: storageData.retailPrice,
                 };
                 table.insert(tableData)
               }
@@ -585,9 +583,8 @@ export default defineComponent({
       const table = xGrid.value
       if(table) {
         data = data.map(item => {
-          item.unitPrice = item.retailPrice
+          item.warehouseId = otherStorageFormState.warehouseId
           item.productNumber = 1
-          item.amount = item.retailPrice * item.productNumber
           return item
         })
         table.insert(data)

From a17628e05360dc96fd93066b7f3e49d768847c71 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:50:07 +0800
Subject: [PATCH 10/12] fix: Fix bugs in inventory deduction and price
 corresponding business data for sale module

---
 .../sales/order/components/AddEditModal.vue   | 40 ++++++++++---------
 .../sales/refund/components/AddEditModal.vue  | 26 ++++++------
 .../shipments/components/AddEditModal.vue     | 33 +++++++++------
 3 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/web/src/views/sales/order/components/AddEditModal.vue b/web/src/views/sales/order/components/AddEditModal.vue
index 85471262..95ccb86f 100644
--- a/web/src/views/sales/order/components/AddEditModal.vue
+++ b/web/src/views/sales/order/components/AddEditModal.vue
@@ -238,7 +238,7 @@ import {AccountResp} from "@/api/financial/model/accountModel";
 import XEUtils from "xe-utils";
 import MultipleAccountsModal from "@/views/basic/settlement-account/components/MultipleAccountsModal.vue";
 import {ProductStockSkuResp} from "@/api/product/model/productModel";
-import {getDefaultWarehouse} from "@/api/basic/warehouse";
+import {getWarehouseList} from "@/api/basic/warehouse";
 const VNodes = {
   props: {
     vnodes: {
@@ -337,14 +337,14 @@ export default defineComponent({
 
     function openAddEditModal(id: string | undefined) {
       open.value = true
-     loadCustomerList();
-      loadDefaultWarehouse();
-     loadSalePersonalList();
-     loadAccountList();
-     loadProductSku();
+      loadCustomerList();
+      loadWarehouseList();
+      loadSalePersonalList();
+      loadAccountList();
+      loadProductSku();
       if (id) {
         title.value = '编辑-销售订单'
-        loadRefundDetail(id);
+        loadOrderDetail(id);
       } else {
         title.value = '新增-销售订单'
         loadGenerateId();
@@ -392,11 +392,16 @@ export default defineComponent({
       })
     }
 
-    function loadDefaultWarehouse() {
-      getDefaultWarehouse().then(res => {
+    function loadWarehouseList() {
+      getWarehouseList().then(res => {
         const data = res.data
         if(data) {
-          formState.warehouseId = data.id
+          const defaultWarehouse = res.data.find(item => item.isDefault === 1)
+          if(defaultWarehouse) {
+            formState.warehouseId = defaultWarehouse.id
+          } else {
+            formState.warehouseId = res.data[0].id
+          }
         }
       })
     }
@@ -430,10 +435,11 @@ export default defineComponent({
               selectRow.row.productStandard = product.productStandard
               selectRow.row.productUnit = product.productUnit
               selectRow.row.stock = product.currentStock
-              selectRow.row.unitPrice = product.unitPrice
-              selectRow.row.taxTotalPrice = product.unitPrice
-              selectRow.row.amount = product.unitPrice
+              selectRow.row.unitPrice = product.salePrice
+              selectRow.row.taxTotalPrice = product.salePrice
+              selectRow.row.amount = product.salePrice
               selectRow.row.productNumber = 1
+              selectRow.row.taxRate = 0
               table.updateData(selectRow.rowIndex, selectRow.row)
             } else {
               createMessage.warn("该条码查询不到商品信息")
@@ -443,7 +449,7 @@ export default defineComponent({
       }
     }
 
-    async function loadRefundDetail(id) {
+    async function loadOrderDetail(id) {
       clearData();
       const result = await getSaleOrderDetail(id)
       if(result) {
@@ -553,8 +559,6 @@ export default defineComponent({
                 };
                 table.insert(tableData)
               }
-              // 调用单价改变方法进行一次计算
-              // unitPriceChange(table)
               // 更新数据
               formState.discountLastAmount = getTaxTotalPrice.value
             }
@@ -748,9 +752,9 @@ export default defineComponent({
       if(table) {
         // 给表格的unitPrice赋值item的retailPrice
         data = data.map(item => {
-          item.unitPrice = item.retailPrice
+          item.unitPrice = item.salePrice
           item.productNumber = 1
-          item.amount = item.retailPrice * item.productNumber
+          item.amount = item.salePrice * item.productNumber
           item.taxRate = 0
           item.taxAmount = 0
           item.taxTotalPrice = item.amount + item.taxRate
diff --git a/web/src/views/sales/refund/components/AddEditModal.vue b/web/src/views/sales/refund/components/AddEditModal.vue
index 9c249f50..50c3ac95 100644
--- a/web/src/views/sales/refund/components/AddEditModal.vue
+++ b/web/src/views/sales/refund/components/AddEditModal.vue
@@ -240,7 +240,7 @@ import {
   RowVO,
   xGrid,
   tableData,
-  gridOptions, getTaxTotalPrice, formState,
+  gridOptions, getTaxTotalPrice,
 } from '/src/views/sales/model/addEditModel';
 import {getCustomerList} from "@/api/basic/customer";
 import {CustomerResp} from "@/api/basic/model/customerModel";
@@ -255,9 +255,8 @@ import {useMessage} from "@/hooks/web/useMessage";
 import { addOrUpdateSaleRefund, getSaleRefundDetail} from "@/api/sale/refund"
 import SelectProductModal from "@/views/product/info/components/SelectProductModal.vue"
 import {getProductSkuByBarCode, getProductStockSku} from "@/api/product/product";
-import {getDefaultWarehouse, getWarehouseList} from "@/api/basic/warehouse";
+import {getWarehouseList} from "@/api/basic/warehouse";
 import {AddOrUpdateReceiptSaleRefundReq, SaleRefundTableData} from "@/api/sale/model/refundModel";
-import {FileData} from '/@/api/retail/model/shipmentsModel';
 import {getAccountList} from "@/api/financial/account";
 import {AccountResp} from "@/api/financial/model/accountModel";
 import XEUtils from "xe-utils";
@@ -418,9 +417,10 @@ export default defineComponent({
               selectRow.row.productStandard = product.productStandard
               selectRow.row.productUnit = product.productUnit
               selectRow.row.stock = product.currentStock
-              selectRow.row.unitPrice = product.unitPrice
-              selectRow.row.taxTotalPrice = product.unitPrice
-              selectRow.row.amount = product.unitPrice
+              selectRow.row.unitPrice = product.salePrice
+              selectRow.row.taxTotalPrice = product.salePrice
+              selectRow.row.amount = product.salePrice
+              selectRow.row.taxRate = 0
               selectRow.row.productNumber = 1
               table.updateData(selectRow.rowIndex, selectRow.row)
             } else {
@@ -586,9 +586,9 @@ export default defineComponent({
                   productUnit: sale.productUnit,
                   stock: sale.stock,
                   productNumber: 1,
-                  amount: sale.retailPrice,
-                  unitPrice: sale.retailPrice,
-                  taxTotalPrice: sale.retailPrice,
+                  amount: sale.salePrice,
+                  unitPrice: sale.salePrice,
+                  taxTotalPrice: sale.salePrice,
                   taxRate: 0,
                   taxAmount: 0,
                 };
@@ -804,11 +804,10 @@ export default defineComponent({
     function handleCheckSuccess(data) {
       const table = xGrid.value
       if(table) {
-        // 给表格的unitPrice赋值item的retailPrice
         data = data.map(item => {
-          item.unitPrice = item.retailPrice
+          item.unitPrice = item.salePrice
           item.productNumber = 1
-          item.amount = item.retailPrice * item.productNumber
+          item.amount = item.salePrice * item.productNumber
           item.taxRate = 0
           item.taxAmount = 0
           item.taxTotalPrice = item.amount + item.taxRate
@@ -926,11 +925,10 @@ export default defineComponent({
     }
 
     watch(getTaxTotalPrice, (newValue, oldValue) => {
-      if(oldValue !== '￥0.00') {
         saleRefundFormState.refundLastAmount = newValue
         saleRefundFormState.thisRefundAmount = newValue
         discountAmountChange()
-      }
+
     });
 
     function discountRateChange() {
diff --git a/web/src/views/sales/shipments/components/AddEditModal.vue b/web/src/views/sales/shipments/components/AddEditModal.vue
index c7518c30..ebd80811 100644
--- a/web/src/views/sales/shipments/components/AddEditModal.vue
+++ b/web/src/views/sales/shipments/components/AddEditModal.vue
@@ -428,9 +428,10 @@ export default defineComponent({
               selectRow.row.productStandard = product.productStandard
               selectRow.row.productUnit = product.productUnit
               selectRow.row.stock = product.currentStock
-              selectRow.row.unitPrice = product.unitPrice
-              selectRow.row.taxTotalPrice = product.unitPrice
-              selectRow.row.amount = product.unitPrice
+              selectRow.row.unitPrice = product.salePrice
+              selectRow.row.taxTotalPrice = product.salePrice
+              selectRow.row.amount = product.salePrice
+              selectRow.row.taxRate = 0
               selectRow.row.productNumber = 1
               table.updateData(selectRow.rowIndex, selectRow.row)
             } else {
@@ -558,7 +559,7 @@ export default defineComponent({
         if (columns) {
           const {data} = res
           if (data) {
-            const sale : SalesData = data
+            const sale: SalesData = data
             const table = xGrid.value
             if (table) {
               //根据productExtendPrice.id判断表格中如果是同一个商品，数量加1 否则新增一行
@@ -585,9 +586,9 @@ export default defineComponent({
                   productUnit: sale.productUnit,
                   stock: sale.stock,
                   productNumber: 1,
-                  amount: sale.retailPrice,
-                  unitPrice: sale.retailPrice,
-                  taxTotalPrice: sale.retailPrice,
+                  amount: sale.salePrice,
+                  unitPrice: sale.salePrice,
+                  taxTotalPrice: sale.salePrice,
                   taxRate: 0,
                   taxAmount: 0,
                 };
@@ -660,6 +661,16 @@ export default defineComponent({
           return;
         }
       }
+      // 库存校验
+      const tableData = table.getTableData().tableData
+      const isStockNotEnough = tableData.some(item => item.productNumber > item.stock)
+      if(isStockNotEnough) {
+        const tableDataNotEnough = tableData.filter(item => item.productNumber > item.stock)
+        const tableDataNotEnoughBarCode = tableDataNotEnough.map(item => item.barCode)
+        const tableDataNotEnoughBarCodeStr = tableDataNotEnoughBarCode.join(",")
+        createMessage.info("条码: "+tableDataNotEnoughBarCodeStr +"商品库存不足，请检查库存数量")
+        return;
+      }
 
       const files = [];
       if (fileList && fileList.value) {
@@ -807,11 +818,10 @@ export default defineComponent({
     function handleCheckSuccess(data) {
       const table = xGrid.value
       if(table) {
-        // 给表格的unitPrice赋值item的retailPrice
         data = data.map(item => {
-          item.unitPrice = item.retailPrice
+          item.unitPrice = item.salePrice
           item.productNumber = 1
-          item.amount = item.retailPrice * item.productNumber
+          item.amount = item.salePrice * item.productNumber
           item.taxRate = 0
           item.taxAmount = 0
           item.taxTotalPrice = item.amount + item.taxRate
@@ -929,12 +939,9 @@ export default defineComponent({
     }
 
     watch(getTaxTotalPrice, (newValue, oldValue) => {
-      // 判断如果是查询详情的方法就不调用 重新计算本次收款 和 本次欠款 的两个方法 因为查询详情的时候已经计算过了
-      if(oldValue !== '￥0.00') {
         saleShipmentsFormState.collectOfferLastAmount = newValue
         saleShipmentsFormState.thisCollectAmount = newValue
         discountAmountChange()
-      }
     });
 
     function discountRateChange() {

From 1642ff621227ba9c588daaab583fef5115da4b14 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:50:12 +0800
Subject: [PATCH 11/12] fix: Fix bugs in inventory deduction and price
 corresponding business data for retail module

---
 .../retail/refund/components/AddEditModal.vue   |  4 ++--
 .../shipments/components/AddEditModal.vue       | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/web/src/views/retail/refund/components/AddEditModal.vue b/web/src/views/retail/refund/components/AddEditModal.vue
index 01f3926d..0042f560 100644
--- a/web/src/views/retail/refund/components/AddEditModal.vue
+++ b/web/src/views/retail/refund/components/AddEditModal.vue
@@ -415,8 +415,8 @@ export default defineComponent({
               selectRow.row.productStandard = product.productStandard
               selectRow.row.productUnit = product.productUnit
               selectRow.row.stock = product.currentStock
-              selectRow.row.retailPrice = product.unitPrice
-              selectRow.row.amount = product.unitPrice
+              selectRow.row.retailPrice = product.retailPrice
+              selectRow.row.amount = product.retailPrice
               selectRow.row.productNumber = 1
               table.updateData(selectRow.rowIndex, selectRow.row)
             } else {
diff --git a/web/src/views/retail/shipments/components/AddEditModal.vue b/web/src/views/retail/shipments/components/AddEditModal.vue
index d244ba53..1f628a6a 100644
--- a/web/src/views/retail/shipments/components/AddEditModal.vue
+++ b/web/src/views/retail/shipments/components/AddEditModal.vue
@@ -414,8 +414,8 @@ export default defineComponent({
               selectRow.row.productStandard = product.productStandard
               selectRow.row.productUnit = product.productUnit
               selectRow.row.stock = product.currentStock
-              selectRow.row.retailPrice = product.unitPrice
-              selectRow.row.amount = product.unitPrice
+              selectRow.row.retailPrice = product.retailPrice
+              selectRow.row.amount = product.retailPrice
               selectRow.row.productNumber = 1
               table.updateData(selectRow.rowIndex, selectRow.row)
             } else {
@@ -561,7 +561,7 @@ export default defineComponent({
     }
 
     async function handleOk(type: number) {
-      const table = xGrid.value
+      const table:any = xGrid.value
       if (!formState.receiptDate) {
         createMessage.warn('请选择单据日期');
         return;
@@ -582,6 +582,17 @@ export default defineComponent({
           return;
         }
       }
+      // 库存校验
+      const tableData = table.getTableData().tableData
+      const isStockNotEnough = tableData.some(item => item.productNumber > item.stock)
+      if(isStockNotEnough) {
+        const tableDataNotEnough = tableData.filter(item => item.productNumber > item.stock)
+        const tableDataNotEnoughBarCode = tableDataNotEnough.map(item => item.barCode)
+        const tableDataNotEnoughBarCodeStr = tableDataNotEnoughBarCode.join(",")
+        createMessage.info("条码: "+tableDataNotEnoughBarCodeStr +"商品库存不足，请检查库存数量")
+        return;
+      }
+
       const files = [];
       if (fileList && fileList.value) {
         for (let i = 0; i < fileList.value.length; i++) {

From 7c163f8512e452aada0fc064464749ad98c9a3e1 Mon Sep 17 00:00:00 2001
From: jameszow <jameszow@163.com>
Date: Thu, 7 Dec 2023 21:50:19 +0800
Subject: [PATCH 12/12] fix: Fix bugs in inventory deduction and price
 corresponding business data for purchase module

---
 .../order/components/AddEditModal.vue         | 56 ++++++++++---------
 .../refund/components/AddEditModal.vue        | 38 ++++++++-----
 .../storage/components/AddEditModal.vue       | 24 ++++----
 3 files changed, 63 insertions(+), 55 deletions(-)

diff --git a/web/src/views/purchase/order/components/AddEditModal.vue b/web/src/views/purchase/order/components/AddEditModal.vue
index 6adee2e1..ce1d82e1 100644
--- a/web/src/views/purchase/order/components/AddEditModal.vue
+++ b/web/src/views/purchase/order/components/AddEditModal.vue
@@ -215,7 +215,7 @@ import { addOrUpdatePurchaseOrder, getPurchaseOrderDetail} from "@/api/purchase/
 import SupplierModal from "@/views/basic/supplier/components/SupplierModal.vue"
 import SelectProductModal from "@/views/product/info/components/SelectProductModal.vue"
 import {getProductSkuByBarCode, getProductStockSku} from "@/api/product/product";
-import {getDefaultWarehouse} from "@/api/basic/warehouse";
+import {getWarehouseList} from "@/api/basic/warehouse";
 import {AddOrUpdateReceiptReq, PurchaseData} from "@/api/purchase/model/orderModel";
 import {FileData} from '/@/api/retail/model/shipmentsModel';
 import {getAccountList} from "@/api/financial/account";
@@ -325,7 +325,7 @@ export default defineComponent({
     function openAddEditModal(id: string | undefined) {
       open.value = true
       loadSupplierList();
-      loadDefaultWarehouse();
+      loadWarehouseList();
       loadAccountList();
       loadProductSku();
       if (id) {
@@ -338,11 +338,16 @@ export default defineComponent({
       }
     }
 
-    function loadDefaultWarehouse() {
-      getDefaultWarehouse().then(res => {
+    function loadWarehouseList() {
+      getWarehouseList().then(res => {
         const data = res.data
         if(data) {
-          purchaseOrderFormState.warehouseId = data.id
+          const defaultWarehouse = res.data.find(item => item.isDefault === 1)
+          if(defaultWarehouse) {
+            purchaseOrderFormState.warehouseId = defaultWarehouse.id
+          } else {
+            purchaseOrderFormState.warehouseId = res.data[0].id
+          }
         }
       })
     }
@@ -410,9 +415,10 @@ export default defineComponent({
               selectRow.row.productStandard = product.productStandard
               selectRow.row.productUnit = product.productUnit
               selectRow.row.stock = product.currentStock
-              selectRow.row.unitPrice = product.unitPrice
-              selectRow.row.taxTotalPrice = product.unitPrice
-              selectRow.row.amount = product.unitPrice
+              selectRow.row.unitPrice = product.purchasePrice
+              selectRow.row.taxTotalPrice = product.purchasePrice
+              selectRow.row.amount = product.purchasePrice
+              selectRow.row.taxRate = 0
               selectRow.row.productNumber = 1
               table.updateData(selectRow.rowIndex, selectRow.row)
             } else {
@@ -496,12 +502,12 @@ export default defineComponent({
         if (columns) {
           const {data} = res
           if (data) {
-            const sale : PurchaseData = data
+            const purchase : PurchaseData = data
             const table = xGrid.value
             if (table) {
               //根据productExtendPrice.id判断表格中如果是同一个商品，数量加1 否则新增一行
               const tableData = table.getTableData().tableData
-              const index = tableData.findIndex(item => item.barCode === sale.barCode)
+              const index = tableData.findIndex(item => item.barCode === purchase.barCode)
               if (index > -1) {
                 const row = tableData[index]
                 row.productNumber = Number(row.productNumber) + 1
@@ -516,25 +522,22 @@ export default defineComponent({
                 table.updateData()
               } else {
                 const tableData : RowVO = {
-                  warehouseId: sale.warehouseId,
-                  productId: sale.productId,
-                  barCode: sale.barCode,
-                  productName: sale.productName,
-                  productStandard: sale.productStandard,
-                  productUnit: sale.productUnit,
-                  stock: sale.stock,
+                  warehouseId: purchase.warehouseId,
+                  productId: purchase.productId,
+                  barCode: purchase.barCode,
+                  productName: purchase.productName,
+                  productStandard: purchase.productStandard,
+                  productUnit: purchase.productUnit,
+                  stock: purchase.stock,
                   productNumber: 1,
-                  amount: sale.retailPrice,
-                  unitPrice: sale.retailPrice,
-                  taxTotalPrice: sale.retailPrice,
+                  amount: purchase.purchasePrice,
+                  unitPrice: purchase.purchasePrice,
+                  taxTotalPrice: purchase.purchasePrice,
                   taxRate: 0,
                   taxAmount: 0,
                 };
                 table.insert(tableData)
               }
-              // 调用单价改变方法进行一次计算
-              // unitPriceChange(table)
-              // 更新数据
               purchaseOrderFormState.discountLastAmount = getTaxTotalPrice.value
             }
           }
@@ -727,11 +730,10 @@ export default defineComponent({
     function handleCheckSuccess(data) {
       const table = xGrid.value
       if(table) {
-        // 给表格的unitPrice赋值item的retailPrice
         data = data.map(item => {
-          item.unitPrice = item.retailPrice
+          item.unitPrice = item.purchasePrice
           item.productNumber = 1
-          item.amount = item.retailPrice * item.productNumber
+          item.amount = item.purchasePrice * item.productNumber
           item.taxRate = 0
           item.taxAmount = 0
           item.taxTotalPrice = item.amount + item.taxRate
@@ -847,7 +849,7 @@ export default defineComponent({
       }
     }
 
-    watch(getTaxTotalPrice, (newValue, oldValue) => {
+    watch(getTaxTotalPrice, (newValue) => {
       purchaseOrderFormState.discountLastAmount = newValue
       // 重新调用本次收款
       discountAmountChange()
diff --git a/web/src/views/purchase/refund/components/AddEditModal.vue b/web/src/views/purchase/refund/components/AddEditModal.vue
index 70162688..ada0db6b 100644
--- a/web/src/views/purchase/refund/components/AddEditModal.vue
+++ b/web/src/views/purchase/refund/components/AddEditModal.vue
@@ -226,7 +226,7 @@ import {
   xGrid,
   tableData,
   gridOptions,
-  getTaxTotalPrice, purchaseOrderFormState,
+  getTaxTotalPrice,
 } from '/src/views/purchase/model/addEditModel';
 import {useModal} from "@/components/Modal";
 import {generateId, uploadOss} from "@/api/basic/common";
@@ -237,7 +237,7 @@ import { addOrUpdatePurchaseRefund, getPurchaseRefundDetail} from "@/api/purchas
 import SupplierModal from "@/views/basic/supplier/components/SupplierModal.vue"
 import SelectProductModal from "@/views/product/info/components/SelectProductModal.vue"
 import {getProductSkuByBarCode, getProductStockSku} from "@/api/product/product";
-import {getDefaultWarehouse, getWarehouseList} from "@/api/basic/warehouse";
+import {getWarehouseList} from "@/api/basic/warehouse";
 import {AddOrUpdatePurchaseRefundReq, PurchaseRefundData} from "@/api/purchase/model/refundModel";
 import {FileData} from '/@/api/retail/model/shipmentsModel';
 import {getAccountList} from "@/api/financial/account";
@@ -452,10 +452,11 @@ export default defineComponent({
               selectRow.row.productStandard = product.productStandard
               selectRow.row.productUnit = product.productUnit
               selectRow.row.stock = product.currentStock
-              selectRow.row.unitPrice = product.unitPrice
-              selectRow.row.taxTotalPrice = product.unitPrice
-              selectRow.row.amount = product.unitPrice
+              selectRow.row.unitPrice = product.purchasePrice
+              selectRow.row.taxTotalPrice = product.purchasePrice
+              selectRow.row.amount = product.purchasePrice
               selectRow.row.productNumber = 1
+              selectRow.row.taxRate = 0
               table.updateData(selectRow.rowIndex, selectRow.row)
             } else {
               createMessage.warn("该条码查询不到商品信息")
@@ -574,9 +575,9 @@ export default defineComponent({
                   productUnit: purchase.productUnit,
                   stock: purchase.stock,
                   productNumber: 1,
-                  amount: purchase.retailPrice,
-                  unitPrice: purchase.retailPrice,
-                  taxTotalPrice: purchase.retailPrice,
+                  amount: purchase.purchasePrice,
+                  unitPrice: purchase.purchasePrice,
+                  taxTotalPrice: purchase.purchasePrice,
                   taxRate: 0,
                   taxAmount: 0,
                 };
@@ -644,6 +645,16 @@ export default defineComponent({
           return;
         }
       }
+      // 库存校验
+      const tableData = table.getTableData().tableData
+      const isStockNotEnough = tableData.some(item => item.productNumber > item.stock)
+      if(isStockNotEnough) {
+        const tableDataNotEnough = tableData.filter(item => item.productNumber > item.stock)
+        const tableDataNotEnoughBarCode = tableDataNotEnough.map(item => item.barCode)
+        const tableDataNotEnoughBarCodeStr = tableDataNotEnoughBarCode.join(",")
+        createMessage.info("条码: "+tableDataNotEnoughBarCodeStr +"商品库存不足，请检查库存数量")
+        return;
+      }
 
       const files = [];
       if (fileList && fileList.value) {
@@ -800,11 +811,10 @@ export default defineComponent({
     function handleCheckSuccess(data) {
       const table = xGrid.value
       if(table) {
-        // 给表格的unitPrice赋值item的retailPrice
         data = data.map(item => {
-          item.unitPrice = item.retailPrice
+          item.unitPrice = item.purchasePrice
           item.productNumber = 1
-          item.amount = item.retailPrice * item.productNumber
+          item.amount = item.purchasePrice * item.productNumber
           item.taxRate = 0
           item.taxAmount = 0
           item.taxTotalPrice = item.amount + item.taxRate
@@ -922,12 +932,10 @@ export default defineComponent({
       }
     }
 
-    watch(getTaxTotalPrice, (newValue, oldValue) => {
-      if(oldValue !== '￥0.00') {
-        discountAmountChange()
+    watch(getTaxTotalPrice, (newValue) => {
         purchaseRefundFormState.refundLastAmount = newValue
         purchaseRefundFormState.thisRefundAmount = newValue
-      }
+      discountAmountChange()
     });
 
     function onSearch() {
diff --git a/web/src/views/purchase/storage/components/AddEditModal.vue b/web/src/views/purchase/storage/components/AddEditModal.vue
index 1b16398a..23be012e 100644
--- a/web/src/views/purchase/storage/components/AddEditModal.vue
+++ b/web/src/views/purchase/storage/components/AddEditModal.vue
@@ -414,10 +414,11 @@ export default defineComponent({
               selectRow.row.productStandard = product.productStandard
               selectRow.row.productUnit = product.productUnit
               selectRow.row.stock = product.currentStock
-              selectRow.row.unitPrice = product.unitPrice
-              selectRow.row.taxTotalPrice = product.unitPrice
-              selectRow.row.amount = product.unitPrice
+              selectRow.row.unitPrice = product.purchasePrice
+              selectRow.row.taxTotalPrice = product.purchasePrice
+              selectRow.row.amount = product.purchasePrice
               selectRow.row.productNumber = 1
+              selectRow.row.taxRate = 0
               table.updateData(selectRow.rowIndex, selectRow.row)
             } else {
               createMessage.warn("该条码查询不到商品信息")
@@ -564,9 +565,9 @@ export default defineComponent({
                   productUnit: purchase.productUnit,
                   stock: purchase.stock,
                   productNumber: 1,
-                  amount: purchase.retailPrice,
-                  unitPrice: purchase.retailPrice,
-                  taxTotalPrice: purchase.retailPrice,
+                  amount: purchase.purchasePrice,
+                  unitPrice: purchase.purchasePrice,
+                  taxTotalPrice: purchase.purchasePrice,
                   taxRate: 0,
                   taxAmount: 0,
                 };
@@ -790,11 +791,10 @@ export default defineComponent({
     function handleCheckSuccess(data) {
       const table = xGrid.value
       if(table) {
-        // 给表格的unitPrice赋值item的retailPrice
         data = data.map(item => {
-          item.unitPrice = item.retailPrice
+          item.unitPrice = item.purchasePrice
           item.productNumber = 1
-          item.amount = item.retailPrice * item.productNumber
+          item.amount = item.purchasePrice * item.productNumber
           item.taxRate = 0
           item.taxAmount = 0
           item.taxTotalPrice = item.amount + item.taxRate
@@ -912,12 +912,10 @@ export default defineComponent({
       }
     }
 
-    watch(getTaxTotalPrice, (newValue, oldValue) => {
-      if(oldValue !== '￥0.00') {
-        discountAmountChange()
+    watch(getTaxTotalPrice, (newValue) => {
         purchaseStorageFormState.paymentLastAmount = newValue
         purchaseStorageFormState.thisPaymentAmount = newValue
-      }
+      discountAmountChange()
     });
 
     function onSearch() {