仓库

src/api/classifyManage/index.js

@@ -64,3 +64,14 @@ export async function getInfoById (id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+
+// 批次明细
+
+export async function getBatchDetails (data) {
+  const res = await request.get(`/wms/outin/getBatchDetails`, {  params: data });
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/warehouseManagement/stockLedger/allBatchDetails.vue

@@ -113,6 +113,7 @@
           // // name: this.baseInfo.assetName,
           // // warehousingType: _warehousingType(this.baseInfo.assetType)
           // //   .warehousingType,
+
         };
       }
     },

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

@@ -34,16 +34,16 @@
                 </template>
               </el-table-column>
               <el-table-column label="入库单号" prop="bizNum"></el-table-column>
-              <el-table-column label="入库场景" prop="bizScene">
+              <el-table-column label="入库场景" prop="bizType">
                 <template slot-scope="{ row }">
-                  {{ getSceneState(+row.bizScene) }}
+                  {{ getSceneState(+row.bizType) }}
                 </template>
               </el-table-column>
-              <el-table-column label="数量" prop=""></el-table-column>
+              <el-table-column label="数量" prop="count"></el-table-column>
               <el-table-column
                 label="包装单位"
                 width="120"
-                prop="minPackUnit"
+                prop="packingUnit"
               ></el-table-column>
               <el-table-column
                 label="最小包装单位"
@@ -58,18 +58,16 @@
                 show-overflow-tooltip
               >
                 <template slot-scope="{ row }">
-                  {{ row.warehouseName }}-{{ row.areaName }}-{{
-                    row.shelfCode
-                  }}-{{ row.cargoSpaceCode }}
+                  {{ row.position}}
                 </template>
               </el-table-column>
               <el-table-column
                 label="入库时间"
-                prop="createTime"
+                prop="updateTime"
               ></el-table-column>
               <el-table-column
                 label="入库人"
-                prop="createTime"
+                prop=""
               ></el-table-column>
               <el-table-column label="条码" prop=""></el-table-column>
             </el-table>
@@ -84,18 +82,18 @@
       </el-table-column>
       <el-table-column
         label="库存数量"
-        prop="realInventoryNum"
+        prop="availableCountBase"
       ></el-table-column>
-      <el-table-column label="库存数量" prop=""></el-table-column>
-      <el-table-column label="计量单位" prop="unit"></el-table-column>
-      <el-table-column label="重量单位" prop="unit"></el-table-column>
+   
+      <el-table-column label="计量单位" prop="measuringUnit"></el-table-column>
+      <el-table-column label="重量单位" prop=""></el-table-column>
       <el-table-column
         label="包装数量"
-        prop="measurementUnit"
+        prop="packingUnit"
       ></el-table-column>
       <el-table-column label="最小包装单元" prop=""></el-table-column>
-      <el-table-column label="首次入库时间" prop="firstTime"></el-table-column>
-      <el-table-column label="最近出库时间" prop="lastTime"></el-table-column>
+      <el-table-column label="首次入库时间" prop="createTime"></el-table-column>
+      <el-table-column label="最近出库时间" prop=""></el-table-column>
       <el-table-column label="质检单" prop="" v-if="baseInfo.assetType === 3">
         <template slot-scope="{ row }">
           <el-button type="text" @click="_getAnalysisCertificate(row)"
@@ -128,6 +126,8 @@
   //   getDetail
   // } from '@/api/stockManagement/stockLedger'
   // import { imageView } from '@/utils/index'
+
+  import { getBatchDetails } from '@/api/classifyManage/index'
   export default {
     components: { Pagination },
     props: {
@@ -144,7 +144,7 @@
       return {
         searchForm: { batchNum: '', isZero: '' },
         tableData: [],
-        size: 15,
+        size: 10,
         page: 1,
         total: 0,
         certificateVisible: false,
@@ -152,7 +152,7 @@
       };
     },
     created() {
-      // this.getList()
+      this.getList()
     },
     methods: {
       // getSceneState: useDictLabel(sceneState),
@@ -223,9 +223,10 @@
           isZero: this.searchForm.isZero,
           inventoryCode: this.baseInfo.assetCode,
           name: this.baseInfo.assetName,
-          dimension: +this.$route.query.dimension
+          // dimension: +this.$route.query.dimension
+          batchNo:this.$route.query.batchNo
         };
-        const res = await getDetail(params);
+        const res = await getBatchDetails(params);
         if (res?.success) {
           this.tableData = (res.data.records || []).map((item, index) => ({
             index: index + '' + Date.now(),

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

@@ -156,6 +156,8 @@
   import InWarehouseDialog from './InWarehouseDialog';
   import { inventorybookPage } from '@/api/classifyManage/itemInformation';
   // import { useDictLabel } from '@/utils/dict/index'
+
+  import ouint from '@/api/warehouseManagement/outin';
   export default {
     components: { Pagination, InWarehouseDialog },
     props: {
@@ -180,7 +182,7 @@
           packetStart: ''
         },
         tableData: [],
-        size: 15,
+        size: 10,
         page: 1,
         total: 0
       };
@@ -205,10 +207,10 @@
         this.getList();
       },
       async getList() {
-        const res = await inventorybookPage({
-          bizStatus: 1,
+        const res = await ouint.getInventoryDetails({
           size: this.size,
-          page: this.page
+          page: this.page,
+          type: 1,
           // ...this.baseParams,
           // ...this.searchForm,
           // batchNum: this.baseParams.batchNum || this.searchForm.batchNum

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

@@ -166,6 +166,8 @@
   import { inventorybookPage } from '@/api/classifyManage/itemInformation';
   // import { useDictLabel } from '@/utils/dict/index'
   // import dictMixin from '@/mixins/dictMixins'
+
+  import ouint from '@/api/warehouseManagement/outin';
   export default {
     components: { Pagination, OutWarehouseDialg },
     // mixins: [dictMixin],
@@ -198,7 +200,7 @@
     },
     created() {
       // this.requestDict('类型用途')
-      // this.getList()
+      this.getList()
     },
     methods: {
       // getSceneState: useDictLabel(outputSceneState),
@@ -217,10 +219,10 @@
         this.getList();
       },
       async getList() {
-        const res = await inventorybookPage({
-          bizStatus: 2,
+        const res = await ouint.getInventoryDetails({
           size: this.size,
-          page: this.page
+          page: this.page,
+          type: 2,
           // ...this.baseParams,
           // ...this.searchForm,
           // batchNum: this.baseParams.batchNum || this.searchForm.batchNum

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

@@ -44,6 +44,8 @@
   import Pagination from '@/components/Pagination';
   // import { inventoryDetails } from '@/api/stockManagement/stockLedger'
   // import dictMixins from '@/mixins/dictMixins'
+
+  import ouint from '@/api/warehouseManagement/outin';
   export default {
     components: { Pagination },
     // mixins: [dictMixins],
@@ -83,7 +85,7 @@
       }
     },
     created() {
-      // this.getList()
+      this.getList()
     },
     methods: {
       search() {
@@ -98,7 +100,7 @@
         this.search();
       },
       async getList() {
-        const res = await inventoryDetails({
+        const res = await ouint.getInventoryDetails({
           size: this.size,
           page: this.page,
           ...this.searchForm,

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

@@ -200,7 +200,8 @@
             key,
             dimension: this.$refs.refSeavch.dimension,
             id: row.id,
-            assetId: row.assetId
+            assetId: row.assetId,
+            batchNo: row.batchNo
           }
         });
       }

vue.config.js

@@ -33,7 +33,7 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.3.51:18086', // 测试环境
         // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.132:18086', //朱
+        target: 'http://192.168.1.117:18086', 
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {