组盘新增任务报错

xqs
1 parent 8d50d2b3
Showing 5 changed files with 22 additions and 11 deletions
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/templates/inventory/cycleCountDetail/add.html
src/main/resources/templates/inventory/cycleCountHeader/add.html
@@ -121,17 +121,20 @@ public class CycleCountDetailController extends BaseController {
      * 新增盘点明细
      */
     @GetMapping("/add")
-    public String add(Integer cycleCountHeadId,String companyCode, ModelMap m)
+    public String add(String cycleCountHeadCode,String companyCode, ModelMap m)
     {
-        if(cycleCountHeadId == null){
+        if(cycleCountHeadCode == null){
             throw new SecurityException("盘点头ID不能为空！");
         }
         //相同货主才能盘点,取出盘点头的货主
-        CycleCountHeader cycleCountHeader = cycleCountHeaderService.getById(cycleCountHeadId);
+        CycleCountHeader cycleCountHeader = new CycleCountHeader();
+        cycleCountHeader.setCode(cycleCountHeadCode);
+        cycleCountHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        LambdaQueryWrapper<CycleCountHeader> lamd = Wrappers.lambdaQuery(cycleCountHeader);
+        cycleCountHeader = cycleCountHeaderService.getOne(lamd);
         companyCode = cycleCountHeader.getCompanyCode();
         m.put("companyCode",companyCode);
-        m.put("cycleCountHeadId",cycleCountHeadId);
-
+        m.put("cycleCountHeadCode",cycleCountHeadCode);
         return prefix + "/add";
     }
  
@@ -55,6 +55,9 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
     @Transactional
     public AjaxResult addDetails(String cycleCountHeadCode, Integer[] inventoryDetailIdIds) {
  
+        if(cycleCountHeadCode == null){
+            throw new ServiceException("盘点主单编码不能为空！");
+        }
         CycleCountHeader cyclecountHeader =new CycleCountHeader();
         cyclecountHeader.setCode(cycleCountHeadCode);
         LambdaQueryWrapper<CycleCountHeader> ch = Wrappers.lambdaQuery(cyclecountHeader);
@@ -52,6 +52,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
@@ -922,7 +924,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         taskDetail.setTaskId(taskHeader.getId());
         LambdaQueryWrapper lambdaQueryWrapper = Wrappers.lambdaQuery(taskDetail);
         List<TaskDetail> taskDetailList = taskDetailService.list(lambdaQueryWrapper);//查询子单
-        List<CycleCountDetail> cycleCountDetailList = new ArrayList<>();
+        List<CycleCountDetail> cycleCountDetailList = new CopyOnWriteArrayList<>();
         for (TaskDetail item : taskDetailList) {
             item.setStatus(100);
             item.setLastUpdatedBy(ShiroUtils.getLoginName()); //更新用户
@@ -8,7 +8,7 @@
 	<div class="row">
 		<div class="col-sm-12 select-info">
 			<form id="inventory-form">
-                <input type="hidden" id="cycleCountHeadId" name="cycleCountHeadId" th:value="${cycleCountHeadId}">
+                <input type="hidden" id="cycleCountHeadCode" name="cycleCountHeadCode" th:value="${cycleCountHeadCode}">
 					<div class="select-list">
 						<ul>
                             <ul>
@@ -329,16 +329,16 @@
         rows.forEach(function (item) {
 			ids.push(item.id);
         });
-        addInner($('#cycleCountHeadId').val(),ids.join(','));
+        addInner($('#cycleCountHeadCode').val(),ids.join(','));
     }
  
-    function addInner(cycleCountHeadId,ids) {
+    function addInner(cycleCountHeadCode,ids) {
         $.ajax({
             cache : true,
             type : "post",
             url : prefix_cycleDetails + "/add",
             data:{
-                cycleCountHeadId:cycleCountHeadId,
+                cycleCountHeadCode:cycleCountHeadCode,
                 inventoryDetailIdIds:ids
             },
             async : false,
@@ -33,9 +33,12 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">货主：</label>
                 <div class="col-sm-8">
-                    <input id="companyCode" name="companyCode" class="form-control" type="text">
+                    <select id="companyCode" name="companyCode" class="form-control" th:with="list=${@companyService.getCode()}">
+                        <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}" th:attr = " code = ${item['code']}"></option>
+                    </select>
                 </div>
             </div>
+
             <div class="form-group">
                 <label class="col-sm-3 control-label">总货位数：</label>
                 <div class="col-sm-8">