盘点审核流程修改

ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java

@@ -176,6 +176,8 @@ public class CheckDifferenceRecordController extends BaseController {
                 newStock.setProductGuid(record.getProductGuid());
                 newStock.setProductId(record.getProductId());
                 newStock.setStockStatus("1"); // 设置库存状态为正常
+                newStock.setWarehouseId(record.getWarehouseId());
+                newStock.setInType("");
                 // 初始化extraField对象
                 ExtraField extraField = new ExtraField();
                 extraField.setProductId(record.getProductId());

ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml

@@ -105,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare3 != null  and spare3 != ''"> and spare3 = #{spare3}</if>
             <if test="spare4 != null  and spare4 != ''"> and spare4 = #{spare4}</if>
             <if test="spare5 != null  and spare5 != ''"> and spare5 = #{spare5}</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
 

ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml

@@ -76,6 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare3 != null  and spare3 != ''"> and cs.spare3 = #{spare3}</if>
             <if test="spare4 != null  and spare4 != ''"> and cs.spare4 = #{spare4}</if>
             <if test="spare5 != null  and spare5 != ''"> and cs.spare5 = #{spare5}</if>
+            <if test="params.warehouseDataScope != null and params.warehouseDataScope !=''">
+                ${params.warehouseDataScope}
+            </if>
         </where>
     </select>
 

ruoyi-ui/src/lang/zh.js

@@ -432,6 +432,9 @@ export default {
     autoAllocationSuccess:"自动分配成功",
     checkPort:'盘点出口',
     departmentName: '部门名称',
+    auditTitle:'审核单据',
+    selectExit:'选择出口',
+    pleaseSelectExit:'请选择出口',
   },
   // ***************盘点入库作业*************
   checkJobIn: {

ruoyi-ui/src/views/check/stockCheck/index.vue

@@ -251,10 +251,10 @@
     />
 
     <!-- 审核弹窗 -->
-    <el-dialog title="$t('outStockoutManage.auditTitle')" :visible.sync="auditDialogVisible" width="500px" append-to-body>
+    <el-dialog :title="$t('checkStockCheck.auditTitle')" :visible.sync="auditDialogVisible" width="500px" append-to-body>
       <el-form ref="auditForm" :model="auditForm" :rules="auditRules" label-width="100px">
-        <el-form-item label="$t('outStockoutManage.selectExit')" prop="exitId">
-          <el-select v-model="auditForm.exitId" placeholder="$t('outStockoutManage.pleaseSelectExit')" clearable style="width: 100%">
+        <el-form-item :label="$t('checkStockCheck.selectExit')" prop="exitId">
+          <el-select v-model="auditForm.exitId" :placeholder="$t('checkStockCheck.pleaseSelectExit')" clearable style="width: 100%">
             <el-option
               v-for="item in exitOptions"
               :key="item.exitId"