修改权限 ，修改字段展示

ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/controller/CheckStockinController.java

@@ -117,6 +117,7 @@ public class CheckStockinController extends BaseController
      */
     @Log(title = "盘点主单保存", businessType = BusinessType.INSERT)
     @PostMapping("/saveBill")
+    @PreAuthorize("@ss.hasPermi('check:stockCheck:saveBill')")
     @ResponseBody
     public AjaxResult saveBill(@RequestBody CheckStockVo checkStockVo) {
         String stockOutId = checkStockinService.saveBill(checkStockVo);

ruoyi-admin/src/main/java/com/ruoyi/check/stockcheckdetail/controller/CheckStockinDetailController.java

@@ -43,7 +43,7 @@ public class CheckStockinDetailController extends BaseController
     /**
      * 查询盘库单据子信息列表
      */
-    @PreAuthorize("@ss.hasPermi('check:stockCheckDetail:list')")
+    @PreAuthorize("@ss.hasAnyPermi('check:stockCheckDetail:list,check:productAndStock:list')")
     @GetMapping("/list")
     public TableDataInfo list(CheckStockinDetail checkStockinDetail)
     {

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/InMydoJobController.java

@@ -115,7 +115,7 @@ public class InMydoJobController extends BaseController
     /**
      * 手动作废任务表
      */
-    @PreAuthorize("@ss.hasPermi('job:mydoJob:manualInvalidation')")
+    @PreAuthorize("@ss.hasAnyPermi('job:mydoJob:manualInvalidation,job:checkMydoJob:manualInvalidation')")
     @Log(title = "任务表", businessType = BusinessType.DELETE)
     @PostMapping("/manualInvalidation")
     public AjaxResult manualInvalidation(@RequestBody MydoJob mydoJob)
@@ -126,7 +126,7 @@ public class InMydoJobController extends BaseController
     /**
      * 手动完成任务表
      */
-    @PreAuthorize("@ss.hasPermi('job:mydoJob:manualCompleted')")
+    @PreAuthorize("@ss.hasAnyPermi('job:mydoJob:manualCompleted,job:checkMydoJob:manualCompleted')")
     @Log(title = "任务表", businessType = BusinessType.OTHER)
     @PostMapping("/manualCompleted")
     public AjaxResult manualCompleted(@RequestBody MydoJob mydoJob)

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java

@@ -51,7 +51,7 @@ public class OutMydoJobController extends BaseController {
     /**
      * 手动完成
      */
-    @PreAuthorize("@ss.hasPermi('job:outmydoJob:OuthandFinish')")
+    @PreAuthorize("@ss.hasAnyPermi('job:outmydoJob:OuthandFinish,job:checkMydoJob:OuthandFinish,')")
     @Log(title = "出库手动完成", businessType = BusinessType.OTHER)
     @RequestMapping("/OuthandFinish")
     public AjaxResult manualCompleted(@RequestParam("jobIds")String[] jobIds)
@@ -62,7 +62,7 @@ public class OutMydoJobController extends BaseController {
     /**
      * 手动作废
      */
-    @PreAuthorize("@ss.hasPermi('job:outmydoJob:OuthandInvalidation')")
+    @PreAuthorize("@ss.hasAnyPermi('job:outmydoJob:OuthandInvalidation,job:checkMydoJob:OuthandInvalidation')")
     @Log(title = "出库手动作废", businessType = BusinessType.OTHER)
     @RequestMapping("/OuthandInvalidation")
     public AjaxResult OuthandInvalidation(@RequestParam("jobIds")String[] jobIds)

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java

@@ -1,5 +1,6 @@
 package com.ruoyi.job.mydojobdetail.domain;
 
+import com.ruoyi.common.domain.ExtraField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -7,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 子任务对象 mydo_job_detail
- * 
+ *
  * @author ruoyi
  * @date 2025-05-22
  */
@@ -120,6 +121,16 @@ public class MydoJobDetail extends BaseEntity
     private String spare4;
 
     private String status;
+    //额外字段
+    private ExtraField extraField;
+
+    public ExtraField getExtraField() {
+        return extraField;
+    }
+
+    public void setExtraField(ExtraField extraField) {
+        this.extraField = extraField;
+    }
 
     public String getStatus() {
         return status;
@@ -134,257 +145,257 @@ public class MydoJobDetail extends BaseEntity
         this.jobDetailId = jobDetailId;
     }
 
-    public String getJobDetailId() 
+    public String getJobDetailId()
     {
         return jobDetailId;
     }
 
-    public void setJobId(String jobId) 
+    public void setJobId(String jobId)
     {
         this.jobId = jobId;
     }
 
-    public String getJobId() 
+    public String getJobId()
     {
         return jobId;
     }
 
-    public void setStockId(String stockId) 
+    public void setStockId(String stockId)
     {
         this.stockId = stockId;
     }
 
-    public String getStockId() 
+    public String getStockId()
     {
         return stockId;
     }
 
-    public void setLotNo(String lotNo) 
+    public void setLotNo(String lotNo)
     {
         this.lotNo = lotNo;
     }
 
-    public String getLotNo() 
+    public String getLotNo()
     {
         return lotNo;
     }
 
-    public void setInDate(String inDate) 
+    public void setInDate(String inDate)
     {
         this.inDate = inDate;
     }
 
-    public String getInDate() 
+    public String getInDate()
     {
         return inDate;
     }
 
-    public void setInOrOutId(String inOrOutId) 
+    public void setInOrOutId(String inOrOutId)
     {
         this.inOrOutId = inOrOutId;
     }
 
-    public String getInOrOutId() 
+    public String getInOrOutId()
     {
         return inOrOutId;
     }
 
-    public void setInOrOutDId(String inOrOutDId) 
+    public void setInOrOutDId(String inOrOutDId)
     {
         this.inOrOutDId = inOrOutDId;
     }
 
-    public String getInOrOutDId() 
+    public String getInOrOutDId()
     {
         return inOrOutDId;
     }
 
-    public void setProductGuid(String productGuid) 
+    public void setProductGuid(String productGuid)
     {
         this.productGuid = productGuid;
     }
 
-    public String getProductGuid() 
+    public String getProductGuid()
     {
         return productGuid;
     }
 
-    public void setProductId(String productId) 
+    public void setProductId(String productId)
     {
         this.productId = productId;
     }
 
-    public String getProductId() 
+    public String getProductId()
     {
         return productId;
     }
 
-    public void setStockStatus(String stockStatus) 
+    public void setStockStatus(String stockStatus)
     {
         this.stockStatus = stockStatus;
     }
 
-    public String getStockStatus() 
+    public String getStockStatus()
     {
         return stockStatus;
     }
 
-    public void setInQuantity(String inQuantity) 
+    public void setInQuantity(String inQuantity)
     {
         this.inQuantity = inQuantity;
     }
 
-    public String getInQuantity() 
+    public String getInQuantity()
     {
         return inQuantity;
     }
 
-    public void setStockQuantity(String stockQuantity) 
+    public void setStockQuantity(String stockQuantity)
     {
         this.stockQuantity = stockQuantity;
     }
 
-    public String getStockQuantity() 
+    public String getStockQuantity()
     {
         return stockQuantity;
     }
 
-    public void setOutQuantity(String outQuantity) 
+    public void setOutQuantity(String outQuantity)
     {
         this.outQuantity = outQuantity;
     }
 
-    public String getOutQuantity() 
+    public String getOutQuantity()
     {
         return outQuantity;
     }
 
-    public void setLayerQuantity(String layerQuantity) 
+    public void setLayerQuantity(String layerQuantity)
     {
         this.layerQuantity = layerQuantity;
     }
 
-    public String getLayerQuantity() 
+    public String getLayerQuantity()
     {
         return layerQuantity;
     }
 
-    public void setOutLayerQuantity(String outLayerQuantity) 
+    public void setOutLayerQuantity(String outLayerQuantity)
     {
         this.outLayerQuantity = outLayerQuantity;
     }
 
-    public String getOutLayerQuantity() 
+    public String getOutLayerQuantity()
     {
         return outLayerQuantity;
     }
 
-    public void setGiveNum(String giveNum) 
+    public void setGiveNum(String giveNum)
     {
         this.giveNum = giveNum;
     }
 
-    public String getGiveNum() 
+    public String getGiveNum()
     {
         return giveNum;
     }
 
-    public void setStockinId(String stockinId) 
+    public void setStockinId(String stockinId)
     {
         this.stockinId = stockinId;
     }
 
-    public String getStockinId() 
+    public String getStockinId()
     {
         return stockinId;
     }
 
-    public void setStackingId(String stackingId) 
+    public void setStackingId(String stackingId)
     {
         this.stackingId = stackingId;
     }
 
-    public String getStackingId() 
+    public String getStackingId()
     {
         return stackingId;
     }
 
-    public void setExitId(String exitId) 
+    public void setExitId(String exitId)
     {
         this.exitId = exitId;
     }
 
-    public String getExitId() 
+    public String getExitId()
     {
         return exitId;
     }
 
-    public void setPrintDate(String printDate) 
+    public void setPrintDate(String printDate)
     {
         this.printDate = printDate;
     }
 
-    public String getPrintDate() 
+    public String getPrintDate()
     {
         return printDate;
     }
 
-    public void setCustomerId(String customerId) 
+    public void setCustomerId(String customerId)
     {
         this.customerId = customerId;
     }
 
-    public String getCustomerId() 
+    public String getCustomerId()
     {
         return customerId;
     }
 
-    public void setSupplierId(String supplierId) 
+    public void setSupplierId(String supplierId)
     {
         this.supplierId = supplierId;
     }
 
-    public String getSupplierId() 
+    public String getSupplierId()
     {
         return supplierId;
     }
 
-    public void setSpare1(String spare1) 
+    public void setSpare1(String spare1)
     {
         this.spare1 = spare1;
     }
 
-    public String getSpare1() 
+    public String getSpare1()
     {
         return spare1;
     }
 
-    public void setSpare2(String spare2) 
+    public void setSpare2(String spare2)
     {
         this.spare2 = spare2;
     }
 
-    public String getSpare2() 
+    public String getSpare2()
     {
         return spare2;
     }
 
-    public void setSpare3(String spare3) 
+    public void setSpare3(String spare3)
     {
         this.spare3 = spare3;
     }
 
-    public String getSpare3() 
+    public String getSpare3()
     {
         return spare3;
     }
 
-    public void setSpare4(String spare4) 
+    public void setSpare4(String spare4)
     {
         this.spare4 = spare4;
     }
 
-    public String getSpare4() 
+    public String getSpare4()
     {
         return spare4;
     }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/impl/MydoJobDetailServiceImpl.java

@@ -1,6 +1,11 @@
 package com.ruoyi.job.mydojobdetail.service.impl;
 
 import java.util.List;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.common.domain.ExtraField;
+import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.job.mydojobdetail.mapper.MydoJobDetailMapper;
@@ -40,7 +45,13 @@ public class MydoJobDetailServiceImpl implements IMydoJobDetailService
     @Override
     public List<MydoJobDetail> selectMydoJobDetailList(MydoJobDetail mydoJobDetail)
     {
-        return mydoJobDetailMapper.selectMydoJobDetailList(mydoJobDetail);
+        List<MydoJobDetail> mydoJobDetails = mydoJobDetailMapper.selectMydoJobDetailList(mydoJobDetail);
+        for (MydoJobDetail jobDetail : mydoJobDetails) {
+            if (StrUtil.isNotEmpty(jobDetail.getSpare1())){
+                jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class));
+            }
+        }
+        return mydoJobDetails;
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetailfinish/service/impl/MydoJobDetailFinishServiceImpl.java

@@ -3,6 +3,9 @@ package com.ruoyi.job.mydojobdetailfinish.service.impl;
 import java.util.Collections;
 import java.util.List;
 
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.ruoyi.common.domain.ExtraField;
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -12,19 +15,19 @@ import com.ruoyi.job.mydojobdetailfinish.service.IMydoJobDetailFinishService;
 
 /**
  * 历史子作业Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-05-23
  */
 @Service
-public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishService 
+public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishService
 {
     @Autowired
     private MydoJobDetailFinishMapper mydoJobDetailFinishMapper;
 
     /**
      * 查询历史子作业
-     * 
+     *
      * @param jobDetailId 历史子作业主键
      * @return 历史子作业
      */
@@ -36,7 +39,7 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi
 
     /**
      * 查询历史子作业列表
-     * 
+     *
      * @param mydoJobDetailFinish 历史子作业
      * @return 历史子作业
      */
@@ -49,12 +52,19 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi
     @Override
     public List<MydoJobDetail> selectMydoJobDetailFinishListByJobDetail(MydoJobDetail mydoJobDetail) {
         String jobId = mydoJobDetail.getJobId();
-        return mydoJobDetailFinishMapper.selectMydoJobDetailFinishListByJobId(jobId);
+        List<MydoJobDetail> mydoJobDetails = mydoJobDetailFinishMapper.selectMydoJobDetailFinishListByJobId(jobId);
+
+        for (MydoJobDetail jobDetail : mydoJobDetails) {
+            if (StrUtil.isNotEmpty(jobDetail.getSpare1())){
+                jobDetail.setExtraField(JSONUtil.toBean(jobDetail.getSpare1(), ExtraField.class));
+            }
+        }
+        return mydoJobDetails;
     }
 
     /**
      * 新增历史子作业
-     * 
+     *
      * @param mydoJobDetailFinish 历史子作业
      * @return 结果
      */
@@ -66,7 +76,7 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi
 
     /**
      * 修改历史子作业
-     * 
+     *
      * @param mydoJobDetailFinish 历史子作业
      * @return 结果
      */
@@ -78,7 +88,7 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi
 
     /**
      * 批量删除历史子作业
-     * 
+     *
      * @param jobDetailIds 需要删除的历史子作业主键
      * @return 结果
      */
@@ -90,7 +100,7 @@ public class MydoJobDetailFinishServiceImpl implements IMydoJobDetailFinishServi
 
     /**
      * 删除历史子作业信息
-     * 
+     *
      * @param jobDetailId 历史子作业主键
      * @return 结果
      */

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/controller/OutStockoutController.java

@@ -110,6 +110,7 @@ public class OutStockoutController extends BaseController {
      */
     @Log(title = "出库主单保存", businessType = BusinessType.OTHER)
     @PostMapping("/saveBill")
+    @PreAuthorize("@ss.hasPermi('out:outStockout:saveBill')")
     @ResponseBody
     public AjaxResult saveBill(@RequestBody OutStockoutVo outStockoutVo) {
         String stockOutId = outStockoutService.saveBill(outStockoutVo);

ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java

@@ -179,6 +179,8 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService
             Optional<ReceiveProductVo> first = list.stream().filter(x -> x.getProductId().equals(basProduct.getProductId())).findFirst();
             first.ifPresent(receiveProductVo -> basProduct.setQuantity(receiveProductVo.getQuantity()));
             first.ifPresent(receiveProductVo -> basProduct.setLotNo(receiveProductVo.getLotNo()));
+            first.ifPresent(receiveProductVo -> basProduct.setSpare3(receiveProductVo.getCartonNo()));
+            first.ifPresent(receiveProductVo -> basProduct.setSpare4(receiveProductVo.getPackingMethod()));
         }
         return AjaxResult.success(result);
     }

ruoyi-ui/src/lang/en.js

@@ -114,6 +114,10 @@ export default {
     stockStatus: 'Document Status',
     operate: 'Operation',
     selecInType: 'Please select stockin type',
+    netWeight: '净重',
+    totalPrice: '确定',
+    totalNetWeight: '总净重',
+    grossWeight: '毛重',
   },
   // ***************入库单据管理*************
   inStockin: {
@@ -175,7 +179,15 @@ export default {
     selectStartTime: 'Please select Start Time',
     selectFinishTime: 'Please select Finish Time',
     inputEntranceId: 'Please input Entrance ID',
-    inputExitId: 'Please input Exit ID'
+    inputExitId: 'Please input Exit ID',
+    netWeight: '净重',
+    totalPrice: '确定',
+    totalNetWeight: '总净重',
+    grossWeight: '毛重',
+    materialDesc: '物料描述',
+    englishDesc: '英文描述',
+    cartonNo: '箱号',
+    packingMethod: '包装方式',
   },
   // ***************出库单据管理**************
   outStockoutManage: {

ruoyi-ui/src/lang/zh.js

@@ -117,7 +117,11 @@ export default {
     packingMethod: '包装方式',
     quantity: '计划数量',
     stockStatus: '单据状态',
-    operate: '操作'
+    operate: '操作',
+    netWeight: '净重',
+    totalPrice: '确定',
+    totalNetWeight: '总净重',
+    grossWeight: '毛重',
   },
   // ***************入库单据管理*************
   inStockin: {
@@ -179,7 +183,16 @@ export default {
     selectStartTime: '请选择开始时间',
     selectFinishTime: '请选择结束时间',
     inputEntranceId: '请输入入口ID',
-    inputExitId: '请输入出口ID'
+    inputExitId: '请输入出口ID',
+
+    netWeight: '净重',
+    totalPrice: '确定',
+    totalNetWeight: '总净重',
+    grossWeight: '毛重',
+    materialDesc: '物料描述',
+    englishDesc: '英文描述',
+    cartonNo: '箱号',
+    packingMethod: '包装方式',
   },
   // ***************新建出库单据**************
   addOutStockout: {

ruoyi-ui/src/views/bas/BasProduct/index.vue

@@ -59,7 +59,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="箱号" prop="spare3">
+<!--      <el-form-item label="箱号" prop="spare3">
         <el-input
           v-model="queryParams.spare3"
           placeholder="请输入箱号"
@@ -74,7 +74,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="价格" prop="price">
         <el-input
           v-model="queryParams.price"
@@ -207,8 +207,8 @@
       <el-table-column label="英文描述" align="center" prop="spare1"/>
       <el-table-column label="单位" align="center" prop="unit" />
       <el-table-column label="单件净重KG" align="center" prop="spare2" />
-      <el-table-column label="箱号" align="center" prop="spare3" />
+<!--      <el-table-column label="箱号" align="center" prop="spare3" />-->
-      <el-table-column label="包装方式" align="center" prop="spare4" />
+<!--      <el-table-column label="包装方式" align="center" prop="spare4" />-->
       <el-table-column label="长MM" align="center" prop="spare5" />
       <el-table-column label="宽MM" align="center" prop="spare6" />
       <el-table-column label="高MM" align="center" prop="spare7" />
@@ -263,12 +263,12 @@
         <el-form-item label="单件净重KG" prop="spare2">
           <el-input v-model="form.spare2" placeholder="请输入单件净重" />
         </el-form-item>
-        <el-form-item label="箱号" prop="spare3">
+<!--        <el-form-item label="箱号" prop="spare3">
           <el-input v-model="form.spare3" placeholder="请输入箱号" />
         </el-form-item>
         <el-form-item label="包装方式" prop="spare4">
           <el-input v-model="form.spare4" placeholder="请输入包装方式" />
-        </el-form-item>
+        </el-form-item>-->
         <el-form-item label="长MM" prop="spare5">
           <el-input v-model="form.spare5" placeholder="请输入长度" />
         </el-form-item>

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

@@ -31,12 +31,12 @@
         </el-form-item>
         <el-form-item>
           <el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">{{ $t('checkCreate.reset') }}</el-button> <!-- 重置 -->
-          <el-button type="success" icon="el-icon-check" size="mini" @click="handleSave">{{ $t('checkCreate.saveDocument') }}</el-button> <!-- 保存单据 -->
+          <el-button type="success" icon="el-icon-check" size="mini" @click="handleSave" v-hasPermi="['check:stockCheck:saveBill']" >{{ $t('checkCreate.saveDocument') }}</el-button> <!-- 保存单据 -->
         </el-form-item>
       </el-form>
 
       <div class="mb8">
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials">{{ $t('checkCreate.selectMaterial') }}</el-button> <!-- 选择物资 -->
+        <el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['check:productAndStock:list']" @click="handleSelectMaterials"  >{{ $t('checkCreate.selectMaterial') }}</el-button> <!-- 选择物资 -->
         <el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">{{ $t('checkCreate.recreateDocument') }}</el-button> <!-- 重新建单 -->
       </div>
 

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

@@ -216,7 +216,7 @@
             size="mini"
             :disabled="multiple"
             @click="handleManualVoid"
-            v-hasPermi="['check:job:in:void']"
+            v-hasPermi="['job:checkMydoJob:manualInvalidation']"
           >{{$t('checkJobIn.manualVoid')}}</el-button> <!--手动作废-->
         </el-col>
         <el-col :span="1.5">
@@ -227,7 +227,7 @@
             size="mini"
             :disabled="multiple"
             @click="handleManualFinish"
-            v-hasPermi="['check:job:in:finish']"
+            v-hasPermi="['job:checkMydoJob:manualCompleted']"
           >{{$t('checkJobIn.manualFinish')}}</el-button> <!--手动完成-->
         </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

ruoyi-ui/src/views/check/job/out/index.vue

@@ -216,7 +216,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="handleCompletedManually({type: 'invalid'})"
-          v-hasPermi="['job:mydoJob:CompletedManually']"
+          v-hasPermi="['job:checkMydoJob:OuthandFinish']"
         >{{$t('checkJobOut.manualInvalid')}}</el-button> <!-- 手动作废 -->
       </el-col>
       <el-col :span="1.5">
@@ -226,7 +226,7 @@
           icon="el-icon-edit"
           size="mini"
           @click="handleCompletedManually({type: 'completed'})"
-          v-hasPermi="['job:mydoJob:CompletedManually']"
+          v-hasPermi="['job:job:checkMydoJob:OuthandInvalidation']"
         >{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
       </el-col>
   <!-- <el-col :span="1.5">
@@ -297,11 +297,13 @@
             size="mini"
             type="text"
             @click="handleManualFinish(scope.row)"
+            v-hasPermi="['job:checkMydoJob:OuthandFinish']"
           >{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
           <el-button
             size="mini"
             type="text"
             @click="handleManualInvalid(scope.row)"
+            v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
           >{{$t('checkJobOut.manualInvalid')}}</el-button> <!-- 手动作废 -->
         </template>
       </el-table-column>
@@ -338,14 +340,6 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('checkJobOut.supplierId')" align="center" prop="supplierId" /> <!-- 供应商ID -->
-<!--      <el-table-column label="库存数量" align="center" prop="stockQuantity" />
-<!--      <el-table-column label="出库数量" align="center" prop="outQuantity" />
-<!--      <el-table-column label="整层数量" align="center" prop="layerQuantity" />
-<!--      <el-table-column label="出库层数量" align="center" prop="outLayerQuantity" />
-<!--      <el-table-column label="回流数量" align="center" prop="giveNum" />
-<!--      <el-table-column label="追溯入库单ID" align="center" prop="stockinId" />
-<!--      <el-table-column label="垛型ID" align="center" prop="stackingId" />
-<!--      <el-table-column label="出库口ID" align="center" prop="exitId" />-->
       <el-table-column label="生产日期" align="center" prop="printDate" />
 <!--      <el-table-column label="客户ID" align="center" prop="customerId" />-->
       <el-table-column label="供应商ID" align="center" prop="supplierId" />

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

@@ -167,6 +167,7 @@
           plain
           icon="el-icon-plus"
           size="mini"
+          :disabled="single"
           @click="handleReview"
           v-hasPermi="['check:stockCheck:edit']"
         >{{$t('checkStockCheck.review')}}</el-button> <!-- 单据审核 -->

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

@@ -305,8 +305,8 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('inJob.jobDetailId')" align="center" prop="jobDetailId" />
-      <el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID
+<!--      <el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID-->
-      <el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID
+<!--      <el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID-->
       <el-table-column :label="$t('inJob.lotNo')" align="center" prop="lotNo" /> // 批次号
       <el-table-column :label="$t('inJob.inDate')" align="center" prop="inDate" width="180"> // 入库时间
         <template slot-scope="scope">
@@ -315,12 +315,20 @@
       </el-table-column>
       <el-table-column :label="$t('inJob.inOrOutId')" align="center" prop="inOrOutId" /> // 单据ID
       <el-table-column :label="$t('inJob.inOrOutDId')" align="center" prop="inOrOutDId" /> // 子单据ID
-      <el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID
+<!--      <el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID-->
       <el-table-column :label="$t('inJob.productId')" align="center" prop="productId" /> // 物料编码
-      <el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态
+      <el-table-column :label="$t('inJob.materialDesc')" align="center" prop="extraField.materialDesc" /> // 物料描述
+      <el-table-column :label="$t('inJob.englishDesc')" align="center" prop="extraField.englishDesc" /> // 英文描述
+      <el-table-column :label="$t('inJob.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号
+      <el-table-column :label="$t('inJob.packingMethod')" align="center" prop="extraField.packingMethod" /> // 包装方式
+      <el-table-column :label="$t('inJob.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
+      <el-table-column :label="$t('inJob.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
+      <el-table-column :label="$t('inJob.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
+
+<!--      <el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态-->
       <el-table-column :label="$t('inJob.inQuantity')" align="center" prop="inQuantity" /> // 入库数量
-      <el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期
+<!--      <el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期-->
-      <el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID
+<!--      <el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID-->
 <!--      <el-table-column label="备用字段1" align="center" prop="spare1" />
       <el-table-column label="备用字段2" align="center" prop="spare2" />
       <el-table-column label="备用字段3" align="center" prop="spare3" />

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

@@ -162,8 +162,8 @@
         <el-table-column :label="$t('receiveStockinAdd.spare1')" align="center" prop="spare1"/><!--英文描述-->
         <el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit" /><!--单位-->
         <el-table-column :label="$t('receiveStockinAdd.spare2')" align="center" prop="spare2" /><!--单件净重KG-->
-        <el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" /><!--箱号-->
+<!--        <el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" />&lt;!&ndash;箱号&ndash;&gt;-->
-        <el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" /><!--包装方式-->
+<!--        <el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" />&lt;!&ndash;包装方式&ndash;&gt;-->
         <el-table-column :label="$t('receiveStockinAdd.spare5')" align="center" prop="spare5" /><!--长MM-->
         <el-table-column :label="$t('receiveStockinAdd.spare6')" align="center" prop="spare6" /><!--宽MM-->
         <el-table-column :label="$t('receiveStockinAdd.spare7')" align="center" prop="spare7" /><!--高MM-->
@@ -436,7 +436,7 @@ export default {
           addStockin(data).then(() => {
             this.$modal.msgSuccess(this.$t('receiveStockinAdd.addSuccess'));
             // 重置表单数据
-            cancelPri()
+            this.cancelPri();
           });
         }
       });

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

@@ -235,7 +235,7 @@
       <el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
       <el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
         <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.receive_bill_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
       <el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
@@ -316,6 +316,10 @@
       <el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
       <el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
       <el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
+      <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight"/><!--毛重-->
+      <el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight"/><!--净重-->
+      <el-table-column :label="$t('inReceiveStockin.totalPrice')" align="center" prop="extraField.totalPrice"/><!--总价格-->
+      <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight"/><!--总净重-->
       <el-table-column :label="$t('inReceiveStockin.quantity')" width="120" align="center"><!--计划数量-->
         <template slot-scope="scope">
           <el-input-number
@@ -337,7 +341,7 @@
 <!--      <el-table-column label="入库日期" align="center" prop="printDate"/>-->
       <el-table-column :label="$t('inReceiveStockin.stockStatus')" align="center" prop="stockStatus"><!--单据状态-->
         <template slot-scope="scope">
-          <dict-tag :options="statusOptions" :value="scope.row.stockStatus"/>
+          <dict-tag :options="dict.type.receive_bill_status" :value="scope.row.stockStatus"/>
         </template>
       </el-table-column>
 <!--      <el-table-column label="供应商编码" align="center" prop="supplierId"/>-->

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

@@ -294,6 +294,9 @@
       <el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
       <el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
       <el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
+      <el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
+      <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
+      <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
       <el-table-column :label="$t('inReceiveStockin.quantity')" align="center" prop="quantity"/><!--计划数量-->
       <el-table-column :label="$t('inStockin.scanNum')" align="center" prop="scanNum"/><!--扫码数量-->
       <el-table-column :label="$t('inStockin.assignNum')" align="center" prop="assignNum"/><!--实际数量-->

ruoyi-ui/src/views/out/addOutStockout.vue

@@ -31,12 +31,12 @@
       </el-form-item>
       <el-form-item>
         <el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">{{$t('addOutStockout.reset')}}<!--重置--></el-button>
-        <el-button type="success" icon="el-icon-check" size="mini" @click="handleSave">{{$t('addOutStockout.saveDocument')}}<!--保存单据--></el-button>
+        <el-button type="success" icon="el-icon-check" size="mini" @click="handleSave" v-hasPermi="['out:outStockout:saveBill']">{{$t('addOutStockout.saveDocument')}}<!--保存单据--></el-button>
       </el-form-item>
     </el-form>
 
     <div class="mb8">
-      <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials">{{$t('addOutStockout.selectMaterial')}}<!--选择物资--></el-button>
+      <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials" v-hasPermi="['out:productAndStock:list']">{{$t('addOutStockout.selectMaterial')}}<!--选择物资--></el-button>
       <el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">{{$t('addOutStockout.recreateDocument')}}<!--重新建单--></el-button>
     </div>
 

ruoyi-ui/src/views/out/outStockoutManage.vue

@@ -115,6 +115,7 @@
           icon="el-icon-s-promotion"
           size="mini"
           @click="handleAutoAllot"
+          v-hasPermi="['out:outStockout:autoAllot']"
         >{{$t('outStockoutManage.autoAllot')}}</el-button> <!-- 自动分配 -->
       </el-col>
       <el-col :span="1.5">
@@ -124,6 +125,7 @@
           icon="el-icon-s-tools"
           size="mini"
           @click="handleManualAllot"
+          v-hasPermi="['out:outStockout:manualAllot']"
         >{{$t('outStockoutManage.manualAllot')}}</el-button> <!-- 手动分配 -->
       </el-col>
     </el-row>