优化盘点明细子表内添加字段记录任务子表任务增加实盘调整

李泰瑜
1 parent f6986465
Showing 9 changed files with 51 additions and 22 deletions
ant-design-vue-jeecg/src/views/system/stocktaking/modules/AdjustmentDocModal.vue
ant-design-vue-jeecg/src/views/system/task/TaskDetailList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/entity/CycleCountDetail.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/entity/CycleCountDetailChild.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/ICycleCountDetailChildService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailChildServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -33,6 +33,7 @@ export default {
   components: {},
   props: {
     id: "",
+    taskHeaderId:"",
   },
   data() {
     return {
@@ -42,6 +43,7 @@ export default {
       model: {
         id:this.id,
         countedQty:'',
+        state:this.taskHeaderId,
       },
       labelCol: {
         xs: {span: 24},
@@ -69,6 +69,9 @@
         </template>
  
         <span slot="action" slot-scope="text, record">
+          <adjustment-doc-modal ref="adjustmentModal" @ok="modalFormOk" :id="record.id" :taskHeaderId="record.taskHeaderId"/>
+          <a @click="createMany(record)">实盘登记</a>
+          <a-divider type="vertical"/>
           <a v-has="'taskDetail:edit'" @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical"/>
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -87,11 +90,12 @@
  
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import TaskDetailModal from './modules/TaskDetailModal'
+import AdjustmentDocModal from "../stocktaking/modules/AdjustmentDocModal";
  
 export default {
   name: "TaskDetailList",
   mixins: [JeecgListMixin],
-  components: {TaskDetailModal},
+  components: {TaskDetailModal,AdjustmentDocModal},
   props: {
     mainId: {
       type: String,
@@ -219,7 +223,11 @@ export default {
       this.dataSource = []
       this.selectedRowKeys = []
       this.ipagination.current = 1
-    }
+    },
+    createMany() {
+      this.$refs.adjustmentModal.edit();
+      this.$refs.adjustmentModal.title = "实盘登记";
+    },
  
   }
 }
@@ -285,7 +285,8 @@ public class CycleCountDetailController  extends HuahengBaseController {
 	 public Result confirmGapQty(@RequestBody Map<String,String> map){
 		 String id = map.get("id");
 		 String countedQty = map.get("countedQty");
-		 return cycleCountDetailChildService.confirmGapQty(id,countedQty);
+		 String state = map.get("state");
+		 return cycleCountDetailChildService.confirmGapQty(id,countedQty,state);
 	 }
  
 	/**
@@ -43,10 +43,6 @@ public class CycleCountDetail implements Serializable {
 	@Excel(name = "任务表头", width = 15)
     @ApiModelProperty(value = "任务表头")
     private Integer taskHeaderId;
-	/**任务明细头*/
-	@Excel(name = "任务明细头", width = 15)
-    @ApiModelProperty(value = "任务明细头")
-    private Integer taskDetailId;
 	/**仓库*/
 	@Excel(name = "仓库", width = 15)
     @ApiModelProperty(value = "仓库")
@@ -68,6 +68,10 @@ public class CycleCountDetailChild implements Serializable {
 	@Excel(name = "物料单位", width = 15)
     @ApiModelProperty(value = "物料单位")
     private String materialUnit;
+    /**任务明细头*/
+    @Excel(name = "任务明细头", width = 15)
+    @ApiModelProperty(value = "任务明细头")
+    private Integer taskDetailId;
 	/**系统数量*/
 	@Excel(name = "系统数量", width = 15)
     @ApiModelProperty(value = "系统数量")
@@ -14,5 +14,5 @@ import java.util.List;
 public interface ICycleCountDetailChildService extends IService<CycleCountDetailChild> {
  
  
-    Result confirmGapQty(String id, String countedQty);
+    Result confirmGapQty(String id, String countedQty,String state);
 }
@@ -42,22 +42,35 @@ public class CycleCountDetailChildServiceImpl extends ServiceImpl&lt;CycleCountDeta
  
  
 	@Override
-	public Result confirmGapQty(String id, String countedQty) {
+	public Result confirmGapQty(String id, String countedQty,String state) {
 		//接收子单ID和实盘数量
 		//任务未完成可多次登记。
+		CycleCountDetailChild detailChild=new CycleCountDetailChild();
+		if (StringUtils.isNotEmpty(state))
+		{
+			LambdaQueryWrapper<CycleCountDetailChild> queryWrapper = new LambdaQueryWrapper<>();
+			queryWrapper.eq(CycleCountDetailChild::getTaskDetailId,id);
+			detailChild = this.getOne(queryWrapper);
+		}else
+		{
+			//明细子单据
+			detailChild = this.getById(Integer.valueOf(id));
+		}
+
+		if(StringUtils.isNull(detailChild)){
+			return Result.error("明细子单不存在！");
+		}
+
+
 		BigDecimal qty=new BigDecimal(countedQty);
 		if(qty.compareTo(BigDecimal.ZERO) == -1){
 			return Result.error("实盘登记数不能小于0");
 		}
-		//明细子单据
-		CycleCountDetailChild countDetailChild = this.getById(Integer.valueOf(id));
-		if(StringUtils.isNull(countDetailChild)){
-			return Result.error("明细子单不存在！");
-		}
  
  
  
-		CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(countDetailChild.getCycleCountDetailid());
+
+		CycleCountDetail cycleCountDetail = cycleCountDetailService.getById(detailChild.getCycleCountDetailid());
 		if(StringUtils.isNull(cycleCountDetail)){
 			return Result.error("盘点明细不存在。");
 		}
@@ -66,17 +79,17 @@ public class CycleCountDetailChildServiceImpl extends ServiceImpl&lt;CycleCountDeta
 //            return AjaxResult.error("盘点任务未执行不能登记数量！");
 //        }
  
-		if(countDetailChild.getChildStatus() >= QuantityConstant.CYCLECOUNT_STATUS_COMPLETED){
+		if(detailChild.getChildStatus() >= QuantityConstant.CYCLECOUNT_STATUS_COMPLETED){
 			return Result.error("盘点任务完成后不能再登记数量！");
 		}
  
  
 		//实盘登记后差异数量
-		BigDecimal adjQty = qty.subtract(countDetailChild.getSystemQty());
-		countDetailChild.setGapQty(adjQty);
-		countDetailChild.setCountedQty(qty);
-		countDetailChild.setChildStatus(QuantityConstant.CYCLECOUNT_STATUS_REGISTERED);
-		this.updateById(countDetailChild);
+		BigDecimal adjQty = qty.subtract(detailChild.getSystemQty());
+		detailChild.setGapQty(adjQty);
+		detailChild.setCountedQty(qty);
+		detailChild.setChildStatus(QuantityConstant.CYCLECOUNT_STATUS_REGISTERED);
+		this.updateById(detailChild);
  
  
  
@@ -103,7 +116,7 @@ public class CycleCountDetailChildServiceImpl extends ServiceImpl&lt;CycleCountDeta
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		//修改主单状态
 		CycleCountHeader tmp = new CycleCountHeader();
-		tmp.setCode(countDetailChild.getCyclecountheadcode());
+		tmp.setCode(detailChild.getCyclecountheadcode());
 		tmp.setWarehouseCode(cycleCountDetail.getWarehouseCode());
 		LambdaQueryWrapper<CycleCountHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(tmp);
 		CycleCountHeader cycleCountHeader = cycleCountHeaderService.getOne(lambdaQueryWrapper);
@@ -284,6 +284,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
 			}
 			// 修改子单状态
 			item.setChildStatus(QuantityConstant.CYCLECOUNT_STATUS_BUILDTASK);
+			item.setTaskDetailId(taskDetail.getId());
 			cycleCountDetailChildServiceImpl.updateById(item);
 		}
  
@@ -1563,6 +1563,10 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
  
         for (CycleCountDetailChild child : children)
         {
+            if (!child.getChildStatus().equals(QuantityConstant.CYCLECOUNT_STATUS_REGISTERED))
+            {
+                throw new ServiceException("当前任务里面还有没有进行登记的数据,不能完成让我");
+            }
             InventoryDetail inventoryDetail = inventoryDetailService.getById(child.getInventoryDetaiId());
             if (inventoryDetail==null)
             {