src/api/saleManage/saleorder.js

@@ -52,7 +52,10 @@ export async function getWarehouseOutStock(params) {
     params
   });
   if (res.data.code == 0) {
-    return res.data.data;
+    const data = res.data.data;
+    return data && typeof data === 'object'
+      ? data.availableCountBase || 0
+      : data;
   }
   return Promise.reject(new Error(res.data.message));
 }
@@ -189,7 +192,7 @@ export async function updateOrderInfo(data) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-  
+
 }
 
 //选择物品获取价格
@@ -208,4 +211,4 @@ export async function saleOrderAdd(data) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}

src/views/warehouseManagement/components/AssetsDialog.vue

@@ -310,7 +310,7 @@
           // console.log(row);
           return (
             _this.productLists.some((it) => it.categoryId == row.categoryId) ||
-            _this.dimension == '3' || row.measureQuantity == 0
+            _this.dimension == '3' || row.availableQuantity == 0
           );
         };
       },
@@ -413,7 +413,7 @@
                   return (
                     !_this.productLists.some((item) =>
                       _this.isSameStockRecord(item, row)
-                    ) && row.measureQuantity != 0
+                    ) && row.availableQuantity != 0
                   );
                 }
               }
@@ -428,7 +428,7 @@
                   return (
                     !_this.productLists.some((item) =>
                       _this.isSameStockRecord(item, row)
-                    ) && row.measureQuantity != 0
+                    ) && row.availableQuantity != 0
                   );
                 }
               },
@@ -474,13 +474,13 @@
             label: '可用数量',
             align: 'center',
             showOverflowTooltip: true,
-            formatter: (row) => {
-              // 使用整数运算避免浮点数精度丢失
-              const measure = Number(row.measureQuantity) || 0;
-              const lock = Number(row.lockQuantity) || 0;
-              const result = (measure * 100 - lock * 100) / 100;
-              return Math.round(result * 100) / 100;
-            }
+            // formatter: (row) => {
+            //   // 使用整数运算避免浮点数精度丢失
+            //   const measure = Number(row.measureQuantity) || 0;
+            //   const lock = Number(row.lockQuantity) || 0;
+            //   const result = (measure * 100 - lock * 100) / 100;
+            //   return Math.round(result * 100) / 100;
+            // }
           },
           {
             prop: 'inventoryCycle',
@@ -622,7 +622,7 @@
 
       // 出库数量限制
       handleInput(row, value) {
-        if (row.outboundNum <= row.measureQuantity) {
+        if (row.outboundNum <= row.availableQuantity) {
           // return (row.outboundNum = value.replace(/^(0+)|[^\d]+/g, ''));
 
           // 过滤掉非数字和小数点的字符
@@ -645,7 +645,7 @@
           }
           return
         } else {
-          row.outboundNum = row.measureQuantity;
+          row.outboundNum = row.availableQuantity;
           const currentIndex = this.selectionList.findIndex(item => item.id === row.id)
           if(currentIndex > -1) {
             this.$set(this.selectionList, currentIndex, row);
@@ -673,13 +673,25 @@
             ...this.searchForm,
             isEnabled: 1
           });
-          this.tableData = data.list;
+          this.tableData = data.list.map(item => {
+            const measure = Number(item.measureQuantity) || 0;
+            const lock = Number(item.lockQuantity) || 0;
+            const result = (measure * 100 - lock * 100) / 100;
+            return {
+              ...item,
+              availableQuantity: Math.round(result * 100) / 100
+            }
+          });
           this.total = data.count;
         } else if (this.dimension == 2) {
           // 批次维度
           const data = await storageApi.getBatchList(this.searchForm);
           for (let i = 0; i < data.list.length; i++) {
-            data.list[i].outboundNum = data.list[i].measureQuantity;
+            const measure = Number(item.measureQuantity) || 0;
+            const lock = Number(item.lockQuantity) || 0;
+            const result = (measure * 100 - lock * 100) / 100;
+            data.list[i].availableQuantity = Math.round(result * 100) / 100;
+            data.list[i].outboundNum = data.list[i].availableQuantity;
           }
           this.tableData = data.list;
           this.total = data.count;
@@ -688,12 +700,24 @@
           const data = await storageApi.getMaterialList({
             ...this.searchForm
           });
-          this.tableData = data.list;
+          this.tableData = data.list.map(item => {
+            const measure = Number(item.measureQuantity) || 0;
+            const lock = Number(item.lockQuantity) || 0;
+            const result = (measure * 100 - lock * 100) / 100;
+            return {
+              ...item,
+              availableQuantity: Math.round(result * 100) / 100
+            }
+          });
           this.total = data.count;
         } else {
           // 包装维度
           const data = await storageApi.getPackingList(this.searchForm);
           for (let i = 0; i < data.list.length; i++) {
+            const measure = Number(item.measureQuantity) || 0;
+            const lock = Number(item.lockQuantity) || 0;
+            const result = (measure * 100 - lock * 100) / 100;
+            data.list[i].availableQuantity = Math.round(result * 100) / 100;
             data.list[i].outboundNum = data.list[i].packingQuantity;
           }
           this.tableData = data.list;
@@ -897,6 +921,16 @@
           // console.log(data);
           // let result = this.updateSelect(data);
           // return result;
+
+          data.list.forEach(item => {
+            // 使用整数运算避免浮点数精度丢失
+              const measure = Number(item.measureQuantity) || 0;
+              const lock = Number(item.lockQuantity) || 0;
+              const result = (measure * 100 - lock * 100) / 100;
+              
+              item.availableQuantity = Math.round(result * 100) / 100;
+          });
+          console.log('dimension == 1~~~', data.list);
           this.updateProductOutboundNums(data.list);
           return data;
         }
@@ -910,7 +944,12 @@
             size: limit
           });
           data.list.forEach((item) => {
-            item.outboundNum = item.measureQuantity;
+            const measure = Number(item.measureQuantity) || 0;
+            const lock = Number(item.lockQuantity) || 0;
+            const result = (measure * 100 - lock * 100) / 100;
+            
+            item.availableQuantity = Math.round(result * 100) / 100;
+            item.outboundNum = item.availableQuantity;
           });
           return data;
         }
@@ -924,6 +963,11 @@
             size: limit
           });
           data.list.forEach((item) => {
+            const measure = Number(item.measureQuantity) || 0;
+            const lock = Number(item.lockQuantity) || 0;
+            const result = (measure * 100 - lock * 100) / 100;
+            
+            item.availableQuantity = Math.round(result * 100) / 100;
             item.outboundNum = item.packingQuantity;
           });
           this.updateProductOutboundNums(data.list);

src/views/warehouseManagement/components/outboundRequisitionDialog.vue

@@ -446,6 +446,7 @@ export default {
             let data = res.map((item, index) => {
               return {
                 ...item,
+                sourceReceiveProductId: item.sourceReceiveProductId,
                 index,
                 packingQuantity: 1,
                 minPackingQuantity: item.measureQuantity,

src/views/warehouseManagement/stockLedger/components/details/InWarehouse.vue

@@ -531,8 +531,8 @@ export default {
         categoryId: this.$route.query.id,
         size: this.size,
         pageNum: this.pageNum,
-        bizType: 1,
-        ...this.baseParams
+        ...this.baseParams,
+        type: 1
         // ...this.searchForm,
         // batchNum: this.baseParams.batchNum || this.searchForm.batchNum
       });

src/views/warehouseManagement/stockLedger/components/details/OutWarehouse.vue

@@ -513,8 +513,8 @@
           categoryId: this.$route.query.id,
           size: this.size,
           pageNum: this.pageNum,
-          bizType: 2,
-          ...this.baseParams
+          ...this.baseParams,
+          type: 2
           // ...this.searchForm,
           // batchNum: this.baseParams.batchNum || this.searchForm.batchNum
         });

src/views/warehouseManagement/stockLedger/components/item-list.vue

@@ -452,10 +452,11 @@
             align: 'center',
             showOverflowTooltip: true,
             formatter: (row) => {
-              // 使用整数运算避免浮点数精度丢失
-              const measure = Number(row.measureQuantity) || 0;
+              // 入库计量数量不会随出库变化，可用数量必须使用当前批次库存余额计算
+              const inventoryBalance = Number(row.availableCountBase) || 0;
               const lock = Number(row.lockQuantity) || 0;
-              const result = (measure * 100 - lock * 100) / 100;
+              const result =
+                (inventoryBalance * 100 - lock * 100) / 100;
               return Math.round(result * 100) / 100;
             }
           },
@@ -465,7 +466,8 @@
             sortable: 'custom',
             showOverflowTooltip: true,
             width: 130,
-            align: 'center'
+            align: 'center',
+            formatter: (row) => row.stockCountBase
           },
           // {
           //   prop: 'supplierName',

src/views/warehouseManagement/stockManagement/add.vue

@@ -133,9 +133,10 @@
                 v-model="formData.extInfo.deliveryPhone"
                 clearable /></el-form-item
           ></el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="备注" prop="remark">
               <el-input
+                type="textarea"
                 v-model="formData.remark"
                 placeholder="请详细说明"
               ></el-input>
@@ -1374,6 +1375,11 @@
       }
     },
     watch: {
+      'formData.bizType'(newValue) {
+        if (String(newValue) !== '2') {
+          this.clearInboundRequestId();
+        }
+      },
       packingList: {
         handler(newVal) {
           console.log('包装列表', newVal);
@@ -1444,6 +1450,7 @@
                 categoryModel: item.modelType, // 物品型号
                 specification: item.specification, // 规格
                 brandNum: item.brandNum, // 牌号
+                sourceReceiveProductId: item.sourceReceiveProductId,
                 batchNo: item.batchNo || batchNo, // 批次号
                 systemBatchNo: item.systemBatchNo || '', // 系统内部批次号
                 minPackingQuantity: item.quantity, // 最小包装单元数量
@@ -1817,9 +1824,22 @@
         console.log('query-----------', query);
         console.log(this.formData.bizType, 'bbbbbtype');
         if (this.formData.bizType != 10) {
+          const sourceChanged =
+            this.formData.sourceBizNo !== query.sourceBizNo ||
+            String(this.formData.bizType) !== String(query.bizType);
           this.formData.sourceBizNo = query.sourceBizNo;
           this.formData.bizType = query.bizType;
           this.formData.extInfo.assetType = query.assetType.split(',');
+          if (String(query.bizType) === '2' && sourceChanged) {
+            this.clearInboundRequestId();
+            this.$set(
+              this.formData.extInfo,
+              'inboundRequestId',
+              this.createInboundRequestId()
+            );
+          } else if (String(query.bizType) !== '2') {
+            this.clearInboundRequestId();
+          }
           const batchNo = await getCode('lot_number_code');
           // 获取包装规格
           let packingSpecification =
@@ -2055,9 +2075,32 @@
       // 清除单据来源
       clearSourceBizNo() {
         this.$set(this.formData, 'sourceBizNo', '');
+        this.clearInboundRequestId();
         this.productList = [];
         this.packingList = [];
       },
+      // 生成采购入库请求标识，失败重试时复用同一个标识。
+      createInboundRequestId() {
+        const crypto = window.crypto || window.msCrypto;
+        if (crypto?.randomUUID) {
+          return crypto.randomUUID();
+        }
+        const random = Math.random().toString(36).slice(2);
+        return `inbound-${Date.now()}-${random}`;
+      },
+      ensureInboundRequestId() {
+        if (!this.formData.extInfo.inboundRequestId) {
+          this.$set(
+            this.formData.extInfo,
+            'inboundRequestId',
+            this.createInboundRequestId()
+          );
+        }
+        return this.formData.extInfo.inboundRequestId;
+      },
+      clearInboundRequestId() {
+        this.$delete(this.formData.extInfo, 'inboundRequestId');
+      },
       // 返回
       back() {
         this.$router.go(-1);
@@ -2465,6 +2508,9 @@
 
               return;
             }
+            if (!obj.id && String(obj.bizType) === '2') {
+              obj.extInfo.inboundRequestId = this.ensureInboundRequestId();
+            }
             let api = obj.id ? storageApi.update : storageApi.storage;
             api(obj)
               .then(async (res) => {
@@ -2484,6 +2530,9 @@
                     } else {
                       this.$message.success('操作成功');
                     }
+                    if (!obj.id && String(obj.bizType) === '2') {
+                      this.clearInboundRequestId();
+                    }
                     // 委外入库（非采购）
 
                     this.saveLoading = false;
@@ -2491,9 +2540,9 @@
                     this.back();
                   } catch (error) {
                     this.saveLoading = false;
+                    console.log('提交流程失败', error);
                     // this.$router.push('/warehouseManagement/stockManagement');
                     this.back();
-                    console.log('提交流程失败', error);
                   }
                 }
               })

src/views/warehouseManagement/stocktaking/plan/components/selectType.vue

@@ -41,6 +41,38 @@
               >
             </el-input>
           </el-col>
+          <el-col v-if="dimension == 2" :span="4">
+            <el-input
+              v-model="batchNo"
+              clearable
+              placeholder="批次号"
+              @keyup.enter.native="handleSearch"
+            ></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-input
+              v-model="colorKey"
+              clearable
+              placeholder="颜色"
+              @keyup.enter.native="handleSearch"
+            ></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-input
+              v-model="modelKey"
+              clearable
+              placeholder="机型"
+              @keyup.enter.native="handleSearch"
+            ></el-input>
+          </el-col>
+          <el-col :span="4">
+            <el-input
+              v-model="warehouseName"
+              clearable
+              placeholder="仓库"
+              @keyup.enter.native="handleSearch"
+            ></el-input>
+          </el-col>
         </el-row>
       </div>
       <div class="flex_info">
@@ -226,6 +258,10 @@
           }
         },
         deep: true
+      },
+      dimension() {
+        this.resetSearchFields();
+        this.pages.pageNum = 1;
       }
     },
     components: { AssetTree },
@@ -234,6 +270,10 @@
         factoryList: [],
         factoryId: '',
         value: '',
+        batchNo: '',
+        colorKey: '',
+        modelKey: '',
+        warehouseName: '',
         treeType: '',
         treeList: [],
         tableData: [],
@@ -281,6 +321,12 @@
         this.pages.pageNum = 1;
         this.initData();
       },
+      resetSearchFields() {
+        this.batchNo = '';
+        this.colorKey = '';
+        this.modelKey = '';
+        this.warehouseName = '';
+      },
       onConfirm() {
         this.$emit('selectTableData', [...this.multipleSelection]);
         this.closeWindows();
@@ -307,6 +353,7 @@
       },
       closeWindows() {
         this.multipleSelection = [];
+        this.resetSearchFields();
         this.$emit('update:loadTree', false);
         this.$emit('update:visibleDialog', false);
         this.pages.pageNum = 1;
@@ -326,9 +373,15 @@
         const params = {
           ...this.pages,
           keyWord: this.value,
+          colorKey: this.colorKey,
+          modelKey: this.modelKey,
+          warehouseName: this.warehouseName,
           warehouseId: this.warehouseId,
           categoryLevelId: this.classificationId
         };
+        if (this.dimension == 2) {
+          params.batchNo = this.batchNo;
+        }
         let res = null;
         if (this.dimension == 1) {
           res = await getProductList(params);

src/views/warehouseManagement/stocktaking/plan/index.vue

@@ -46,6 +46,15 @@
           >
             修改
           </el-link>
+          <el-link
+            v-if="row.planStatus == 0"
+            type="danger"
+            :underline="false"
+            icon="el-icon-delete"
+            @click="deleteRow(row)"
+          >
+            删除
+          </el-link>
           <el-link
             v-if="row.planStatus == 1"
             type="primary"
@@ -80,6 +89,7 @@
   import AddInventoryDialog from './components/addInventoryDialog.vue';
   import AssignDialog from './components/assignDialog.vue';
   import {
+    deleteInventoryPlan,
     getInventoryPlanList,
     revocationInventoryPlan
   } from '@/api/inventory';
@@ -230,6 +240,20 @@
           }
         });
       },
+      // 删除未派单计划
+      deleteRow(row) {
+        this.$confirm('是否确定删除该盘点计划?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(async () => {
+            await deleteInventoryPlan([row.id]);
+            this.$message.success('删除成功!');
+            this.$refs.table.reload();
+          })
+          .catch(() => {});
+      },
       // 撤回
       revocationRow(row) {
         this.$confirm('是否确定撤回?', '提示', {

src/views/warehouseManagement/warehouseApplication/components/edit.vue

@@ -112,7 +112,6 @@
 <script>
   import storageApi from '@/api/warehouseManagement';
   import { getCode } from '@/api/codeManagement/index.js';
-  import { re } from 'mathjs';
   export default {
     props: {},
     data() {
@@ -124,7 +123,29 @@
           sourceType: '',
           remark: ''
         },
-        columns: [
+
+        rules: {
+          sourceType: [
+            { required: true, message: '请选择申请类型', trigger: 'change' }
+          ]
+        },
+        loading: false,
+        selectionList: [],
+        ids: [],
+        detailJnVOList: []
+      };
+    },
+    computed: {
+      readonlyMode() {
+        return this.title === '详情';
+      },
+      tableColumns() {
+        return this.title === '详情'
+          ? this.columns.filter((c) => c.type !== 'selection')
+          : this.columns;
+      },
+      columns() {
+        return [
           {
             columnKey: 'selection',
             type: 'selection',
@@ -208,9 +229,28 @@
             width: 160
           },
           {
-            prop: 'originalMeasureQuantity',
+            prop: 'stockCountBase',
             label: '库存数量',
             sortable: 'custom',
+            isNone: this.title == '详情',
+            showOverflowTooltip: true,
+            width: 130,
+            align: 'center'
+          },
+          {
+            prop: 'availableCountBase',
+            isNone: this.title == '详情',
+            label: '可用数量',
+            sortable: 'custom',
+            showOverflowTooltip: true,
+            width: 130,
+            align: 'center'
+          },
+          {
+            prop: 'lockQuantity',
+            isNone: this.title == '详情',
+            label: '锁定数量',
+            sortable: 'custom',
             showOverflowTooltip: true,
             width: 130,
             align: 'center'
@@ -246,26 +286,7 @@
             showOverflowTooltip: true,
             width: 130
           }
-        ],
-        rules: {
-          sourceType: [
-            { required: true, message: '请选择申请类型', trigger: 'change' }
-          ]
-        },
-        loading: false,
-        selectionList: [],
-        ids: [],
-        detailJnVOList: []
-      };
-    },
-    computed: {
-      readonlyMode() {
-        return this.title === '详情';
-      },
-      tableColumns() {
-        return this.title === '详情'
-          ? this.columns.filter((c) => c.type !== 'selection')
-          : this.columns;
+        ].filter((c) => !c.isNone);
       }
     },
 

src/views/warehouseManagement/warehouseDefinition/index.vue

@@ -22,7 +22,7 @@
               ></el-input> </el-form-item
           ></el-col>
           <el-col :span="4">
-            <el-form-item label="仓库类型" prop="inventoryType">
+            <el-form-item label="物品类型" prop="inventoryType">
               <el-select
                 filterable
                 size="small"
@@ -220,6 +220,7 @@
   } from '@/utils/dict/index';
   import { mapGetters, mapActions } from 'vuex';
   import dictEnum from '@/enum/dict';
+  import { getByCode } from '@/api/system/dictionary-data';
   // import selectTree from '@/components/selectTree';
   import WarehouseEdit from './components/WarehouseEdit';
   import warehouseDefinition from '@/api/warehouseManagement/warehouseDefinition';
@@ -299,11 +300,19 @@
           },
           {
             prop: 'inventoryName',
-            label: '仓库类型',
+            label: '物品类型',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 180
           },
+          {
+            prop: 'warehouseType',
+            label: '仓库类型',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 180,
+            formatter: (row) => this.getWarehouseTypeLabel(row.warehouseType)
+          },
           {
             prop: 'areaNumber',
             label: '库区数',
@@ -359,27 +368,49 @@
             filter: useDictLabel(warehouseDefinition_statusList)
           },
           {
-            label: '仓库类型',
+            label: '物品类型',
             key: 'inventoryName'
             // filter: (value) => {
             //   return this.getDictValue('仓库类型', value);
             // }
           },
+          {
+            label: '仓库类型',
+            key: 'warehouseType',
+            filter: (value) => this.getWarehouseTypeLabel(value)
+          },
           { label: '库区数', key: 'areaNumber' },
           { label: '货架数', key: 'goodNumber' },
           { label: '货位数', key: 'allocationNumber' },
           { label: '空货位数', key: 'emptyAllocationNumber' },
           { label: '所属工厂', key: 'factoryId' }
         ],
-        inventoryTypeList: []
+        inventoryTypeList: [],
+        warehouseTypeList: []
       };
     },
     async created() {
       this.requestDict('仓库类型');
+      this.loadWarehouseTypeList();
       this.initData();
     },
     methods: {
       ...mapActions('dict', ['requestDict']),
+      async loadWarehouseTypeList() {
+        try {
+          const res = await getByCode('warehouse_type');
+          this.warehouseTypeList = Object.values(res.data || {}).map((item) => {
+            const key = Object.keys(item)[0];
+            return { code: key, label: Object.values(item)[0] };
+          });
+        } catch (err) {
+          this.$message.error(err.message);
+        }
+      },
+      getWarehouseTypeLabel(value) {
+        const item = this.warehouseTypeList.find((dict) => dict.code == value);
+        return item ? item.label : '';
+      },
       filterFactoryId(factoryId) {
         console.log(this.factoryList);
         let obj = this.factoryList.find((f) => f.id === factoryId);

vue.config.js

@@ -2,7 +2,7 @@
  * @Author: mlchen 374826075@qq.com
  * @Date: 2026-07-21 09:26:11
  * @LastEditors: mlchen 374826075@qq.com
- * @LastEditTime: 2026-07-27 09:31:32
+ * @LastEditTime: 2026-08-26 14:45:52
  * @FilePath: /kd-aiot-frontend-wms/vue.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -43,8 +43,8 @@ module.exports = {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.132:18086',
         // target: 'http://192.168.1.105:18086', //开发
-        target: 'http://192.168.1.251:18086', //开发
-        // target: 'http://192.168.1.251:18186', //测试
+        target: 'http://localhost:18086', //开发
+        // target: 'http://192.168.1.251:18086', //测试
         // target: 'http://192.168.1.116:18086',
 
         // target: 'http://192.168.1.116:18086',