盘点差异，入库联查字段修改，历史单据作业查询

ruoyi-ui/src/views/in/job/index.vue

@@ -263,7 +263,7 @@
       <el-table-column label="任务号" align="center" prop="taskNo" />
       <el-table-column label="供应商" align="center" prop="supplierName" key="supplierId" value="supplierName" />
 <!--      <el-table-column label="客户ID" align="center" prop="customerId" />-->
-      <el-table-column label="部门ID" align="center" prop="departmentId" />
+      <el-table-column label="部门" align="center" prop="departmentName" />
       <el-table-column label="托盘码" align="center" prop="trayCode" />
       <el-table-column label="巷道ID" align="center" prop="roadwayId" />
       <el-table-column label="货位" align="center" prop="cargoSpaceName" />
@@ -389,7 +389,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         jobId: null,
-        status: 1,
+        status: '1',
         onLineType: null,
         taskNo: null,
         supplierId: null,
@@ -404,7 +404,7 @@ export default {
         workshopId: null,
         priority: null,
         executionPhase: null,
-        inOrOut: null,
+        inOrOut: '1',
         createTime: null,
         startTime: null,
         finishTime: null,

ruoyi-ui/src/views/in/receive/add/index.vue

@@ -23,9 +23,9 @@
               <el-select v-model="form.supplierId" :placeholder="$t('receiveStockinAdd.selectSupplier')">
                 <el-option
                   v-for="item in supplierOptions"
-                  :key="item.supplierNo"
+                  :key="item.id"
                   :label="item.simpleName"
-                  :value="item.id"
+                  :value="item.supplierNo"
                 />
               </el-select>
             </el-form-item>
@@ -120,7 +120,7 @@
               icon="el-icon-delete"
               @click="handleDeleteProduct(scope.$index)"
             >{{ $t('receiveStockinAdd.delete') }}</el-button>
-            
+
           </template>
         </el-table-column>
       </el-table>
@@ -193,6 +193,7 @@ import {addStockin} from "@/api/receive/stockin";
 import {listBasProduct} from "@/api/bas/BasProduct";
 import {listBasSupplier} from "@/api/bas/BasSupplier";
 import { getToken } from "@/utils/auth"
+import {listWarehouse} from "@/api/bas/warehouse"
 
 
 export default {
@@ -221,10 +222,7 @@ export default {
 
       },
       // 仓库选项
-      warehouseOptions: [
-        {warehouseId: 1, warehouseName: "主仓库"},
-        {warehouseId: 2, warehouseName: "次仓库"}
-      ],
+      warehouseOptions: [],
       // 供应商选项
       supplierOptions: [],
       // 物料列表
@@ -266,7 +264,7 @@ export default {
     };
   },
   created() {
-    //this.getWarehouseList();
+    this.getWarehouseList();
     this.getSupplierList();
     console.log(this.supplierOptions)
   },

ruoyi-ui/src/views/in/receive/index.vue

@@ -125,12 +125,34 @@
         />
       </el-form-item>
       <el-form-item label="仓库" prop="warehouseId">
-        <el-input
+        <el-select
           v-model="queryParams.warehouseId"
-          placeholder="请输入仓库"
+          placeholder="请选择仓库"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="item in warehouseOptions"
+            :key="item.warehouseId"
+            :label="item.warehouseName"
+            :value="item.warehouseId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择单据状态"
+          clearable
+          @change="handleQuery"
+        >
+          <el-option
+            v-for="dict in statusOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -194,9 +216,13 @@
       <el-table-column label="入库订单ID" align="center" prop="stockinId"/>
       <el-table-column label="入库类型" align="center" prop="inType"/>
       <el-table-column label="建立时间" align="center" prop="createDate"/>
-      <el-table-column label="创建人" align="center" prop="createManId"/>
-      <el-table-column label="单据状态" align="center" prop="status"/>
-      <el-table-column label="仓库ID" align="center" prop="warehouseId"/>
+      <el-table-column label="创建人" align="center" prop="createManName"/>
+      <el-table-column label="单据状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="仓库" align="center" prop="warehouseName"/>
       <!--      <el-table-column label="备用字段5" align="center" prop="spare5" />
             <el-table-column label="备用字段4" align="center" prop="spare4" />
             <el-table-column label="备用字段3" align="center" prop="spare3" />-->
@@ -205,10 +231,10 @@
             <el-table-column label="备用字段1" align="center" prop="spare1" />-->
       <el-table-column label="erp单号" align="center" prop="erpBill"/>
       <el-table-column label="单据来源" align="center" prop="stockSource"/>
-      <el-table-column label="部门编码" align="center" prop="departmentNo"/>
+      <el-table-column label="部门" align="center" prop="departmentName"/>
 <!--      <el-table-column label="客户编码" align="center" prop="customerNo"/>-->
       <el-table-column label="班组编码" align="center" prop="classNo"/>
-      <el-table-column label="供应商编码" align="center" prop="supplierNo"/>
+      <el-table-column label="供应商" align="center" prop="supplierName"/>
       <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -289,7 +315,11 @@
             <el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
             <el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />-->
 <!--      <el-table-column label="入库日期" align="center" prop="printDate"/>-->
-      <el-table-column label="单据状态" align="center" prop="stockStatus"/>
+      <el-table-column label="单据状态" align="center" prop="stockStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="statusOptions" :value="scope.row.stockStatus"/>
+        </template>
+      </el-table-column>
 <!--      <el-table-column label="供应商编码" align="center" prop="supplierId"/>-->
 <!--      <el-table-column label="客户编码" align="center" prop="customerId"/>-->
       <el-table-column label="单位" align="center" prop="unit"/>
@@ -336,11 +366,18 @@
 <script>
 import {listStockin, getStockin, delStockin, addStockin, updateStockin, createStockin} from "@/api/receive/stockin"
 import {listStockInDetail, delStockInDetail,qualityInspection} from "@/api/receive/stockInDetail"
+import {listWarehouse} from "@/api/bas/warehouse"
+import { getDicts } from "@/api/system/dict/data"
 
 export default {
   name: "Stockin",
+  dicts: ['receive_bill_status'],
   data() {
     return {
+      // 仓库选项列表
+      warehouseOptions: [],
+      // 单据状态字典
+      statusOptions: [],
       // 遮罩层
       loading: true,
       detailLoading: true,
@@ -372,7 +409,7 @@ export default {
         inType: null,
         createDate: null,
         createManId: null,
-        status: null,
+        status: '0',
         warehouseId: null,
         spare5: null,
         spare4: null,
@@ -413,6 +450,8 @@ export default {
   },
   created() {
     this.getList()
+    this.getWarehouseList()
+    this.getDictList()
   },
   methods: {
     /** 查询收货单据列表 */
@@ -506,6 +545,7 @@ export default {
     getDetailList(stockinId) {
       this.detailLoading = true;
       this.queryDetailParams.stockinId = stockinId;
+      this.queryDetailParams.status = this.queryParams.status;
       listStockInDetail(this.queryDetailParams).then(response => {
         this.stockInDetailList = response.rows;
         this.detailTotal = response.total;
@@ -573,6 +613,22 @@ export default {
         this.getList()
       })
     },
+    /** 获取字典数据 */
+    getDictList() {
+      getDicts("receive_bill_status").then(response => {
+        this.statusOptions = response.data;
+      });
+    },
+    /** 获取仓库列表 */
+    getWarehouseList() {
+      listWarehouse().then(response => {
+        this.warehouseOptions = response.rows;
+        if (this.warehouseOptions.length > 0) {
+          this.queryParams.warehouseId = this.warehouseOptions[0].warehouseId;
+          this.handleQuery();
+        }
+      });
+    },
   }
 }
 </script>

ruoyi-ui/src/views/in/stockIn/index.vue

@@ -9,16 +9,43 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--      <el-form-item label="入库类型" prop="inType">
-              <el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
-                <el-option
-                  v-for="dict in dict.type.in_bill_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
+      <el-form-item label="入库类型" prop="inType">
+        <el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
+          <el-option
+            v-for="dict in dict.type.in_bill_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单据状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable>
+          <el-option
+            v-for="dict in dict.type.in_bill_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="仓库ID" prop="warehouseId">
+        <el-input
+          v-model="queryParams.warehouseId"
+          placeholder="请输入仓库ID"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="供应商编码" prop="supplierNo">
+        <el-input
+          v-model="queryParams.supplierNo"
+          placeholder="请输入供应商编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--
             <el-form-item label="建立时间" prop="createDate">
               <el-input
                 v-model="queryParams.createDate"
@@ -95,14 +122,7 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="供应商编码" prop="supplierNo">
-              <el-input
-                v-model="queryParams.supplierNo"
-                placeholder="请输入供应商编码"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>-->
+            -->
       <!--      <el-form-item label="备用字段1" prop="spare1">
               <el-input
                 v-model="queryParams.spare1"
@@ -203,6 +223,7 @@
           plain
           icon="el-icon-download"
           size="mini"
+          :disabled="detailMultiple"
           @click="handleBarcodePrinting"
           v-hasPermi="['in:stockIn:barcodePrinting']"
         >打印条码
@@ -222,13 +243,13 @@
         </template>
       </el-table-column>
       <el-table-column label="建立时间" align="center" prop="createDate"/>
-      <el-table-column label="创建人" align="center" prop="createManId"/>
+      <el-table-column label="创建人" align="center" prop="createManName"/>
       <el-table-column label="单据状态" align="center" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="仓库ID" align="center" prop="warehouseId"/>
+      <el-table-column label="仓库" align="center" prop="warehouseName"/>
       <el-table-column label=" 完成日期" align="center" prop="finishDate"/>
       <el-table-column label="erp单号" align="center" prop="erpBill"/>
       <el-table-column label="单据来源" align="center" prop="stockSource">
@@ -236,10 +257,10 @@
           <dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
         </template>
       </el-table-column>
-      <el-table-column label="部门编码" align="center" prop="departmentNo"/>
+      <el-table-column label="部门" align="center" prop="departmentName"/>
       <!--      <el-table-column label="客户编码" align="center" prop="customerNo" />-->
       <el-table-column label="班组编码" align="center" prop="classNo"/>
-      <el-table-column label="供应商编码" align="center" prop="supplierNo"/>
+      <el-table-column label="供应商" align="center" prop="supplierName"/>
       <!--      <el-table-column label="备用字段1" align="center" prop="spare1" />
             <el-table-column label="备用字段2" align="center" prop="spare2" />
             <el-table-column label="备用字段4" align="center" prop="spare4" />
@@ -273,8 +294,8 @@
       @pagination="getList"
     />
 
-    <el-table v-loading="detailLoading" :data="stockInDetailList">
-      <!--      <el-table-column type="selection" width="55" align="center" />-->
+    <el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="子单ID" align="center" prop="stockinDetailId"/>
       <!--      <el-table-column label="主单GUID" align="center" prop="stockinGuid" />-->
       <el-table-column label="主单ID" align="center" prop="stockinId"/>
@@ -358,12 +379,16 @@ export default {
       detailLoading: true,
       // 选中数组
       ids: [],
+      detailIds: [],
       // 主表选中的数据
       stockInListSelected: [],
+      stockInDetailListSelected: [],
       // 非单个禁用
       single: true,
+      detailSingle: true,
       // 非多个禁用
       multiple: true,
+      detailMultiple: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -385,7 +410,7 @@ export default {
         inType: null,
         createDate: null,
         createManId: null,
-        status: null,
+        status: '1',
         warehouseId: null,
         finishDate: null,
         erpBill: null,
@@ -493,6 +518,12 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    handleDetailSelectionChange(selection){
+      this.detailIds = selection.map(item => item.stockinDetailId)
+      this.stockInDetailListSelected = selection
+      this.detailSingle = selection.length !== 1
+      this.detailMultiple = !selection.length
+    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
@@ -565,7 +596,12 @@ export default {
     },
     /** 打印条码按钮操作 */
     handleBarcodePrinting(row){
-      barcodePrinting(row.stockinGuid).then(response => {
+      const stockInId =  row.stockinDetailId ||this.detailIds;
+      //console.log(stockInId)
+      var data = {
+        "stockinIdList": stockInId
+      }
+      barcodePrinting(data).then(response => {
         this.$modal.msgSuccess("打印成功")
         this.getList()
       })
@@ -611,6 +647,7 @@ export default {
     getDetailList(stockinId) {
       this.detailLoading = true;
       this.queryDetailParams.stockinId = stockinId;
+      this.queryDetailParams.status = this.queryParams.status;
       listStockInDetail(this.queryDetailParams).then(response => {
         this.stockInDetailList = response.rows;
         this.detailTotal = response.total;