增加质检状态

肖超群
1 parent 01e3fb9c
Showing 5 changed files with 13 additions and 2 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/task/TaskDetailList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/entity/TaskDetail.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
@@ -179,7 +179,7 @@ export const stockTakeTask = (params, headerId, code) =&gt; postAction(&#39;/cycleCount
 export const increaseInInventoryGain = (params) => postAction('/cycleCountDetail/cycleCountDetail/increaseInInventoryGain', params);
 //盘点任务生成
 export const createCycleCoutTaskByDetailId = (params, toPort) => postAction('/cycleCountDetail/cycleCountDetail/createCycleCoutTaskByDetailId?cycleId=' + params + '&toPort=' + toPort, params);
-//盘点确定实盘数量
+//盘点登记
 export const confirmGapQty = (params) => postAction('/cycleCountDetail/cycleCountDetail/confirmGapQty', params);
 //创建空托盘组入库任务
 export const createManyEmptyIn = (params) => postAction('/task/taskHeader/createManyEmptyIn', params);
@@ -88,7 +88,7 @@
           <a v-if="record.taskType == 700 && record.status != 100" @click="createMany(record)"
             >实盘登记<a-divider type="vertical"
           /></a>
-          <a v-if="record.taskType == 1400 && record.status != 100" @click="qualityRegister(record)"
+          <a v-if="record.taskType == 1400 && record.qualityStatus == 0" @click="qualityRegister(record)"
             >质检登记<a-divider type="vertical"
           /></a>
           <a v-has="'taskDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical"/></a>
@@ -149,6 +149,11 @@ public class TaskDetail implements Serializable {
     @ApiModelProperty(value = "质检单据详情id")
     private Integer qualityDetailId;
  
+    /** 质检状态 */
+    @Excel(name = "质检状态", width = 15)
+    @ApiModelProperty(value = "质检状态")
+    private Integer qualityStatus;
+
     /** 库存状态 */
     @Excel(name = "库存状态", width = 15)
     @Dict(dicCode = "inventory_status")
@@ -2236,6 +2236,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         taskDetail1.setQualityfiedQty(qualityfiedQty);
         taskDetail1.setUnqualityfiedQty(unqualityfiedQty);
         taskDetail1.setRemark(remark);
+        taskDetail1.setQualityStatus(QuantityConstant.QUALITY_TESTING_COMPLETE);
         if (!taskDetailService.updateById(taskDetail1)) {
             throw new JeecgBootException("质检登记失败, 保存质检记录失败");
         }
@@ -424,6 +424,11 @@ public class QuantityConstant {
     // 质检完成
     public static final Integer QUALITY_HEADER_COMPLETE = 200;
  
+    // 待检
+    public static final int QUALITY_TESTING_BUILD = 0;
+    // 质检完成
+    public static final int QUALITY_TESTING_COMPLETE = 1;
+
     /** 来料质检 */
     public static final String QUALITY_TYPE_INCOMING = "QI";
     /** 库内全检 */