Merge branch 'develop' of http://172.16.29.40:8010/wms/wms2 into develop

pengcheng
2 parents d1a02808 3129c018
Showing 5 changed files with 42 additions and 13 deletions
src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailServiceImpl.java
src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java
src/main/resources/templates/inventory/adjustHeader/add.html
src/main/resources/templates/inventory/adjustHeader/adjustHeader.html
@@ -130,7 +130,7 @@ public class adjustDetailController extends BaseController {
         if(adjustDetail.getAdjustCode() == null){
             return AjaxResult.error("调整主单编码不能为空，请先选中主单再新增明细！");
         }
-        //查询主单及加入仓库和货主
+        //查询主单及加入仓库和货主,盘点，质检单编码
         AdjustHeader adjustHeader = new AdjustHeader();
         adjustHeader.setCode(adjustDetail.getAdjustCode());
         LambdaQueryWrapper<AdjustHeader> lambdaQueryWrapper = Wrappers.lambdaQuery(adjustHeader);
@@ -140,6 +140,8 @@ public class adjustDetailController extends BaseController {
         }
         adjustDetail.setWarehouseCode(ah.getWarehouseCode());
         adjustDetail.setCompanyCode(ah.getCompanyCode());
+        adjustDetail.setCycleCountCode(ah.getCycleCountCode());
+        adjustDetail.setCheckCode(ah.getCheckCode());
         return adjustDetailService.addDetails(adjustDetail);
     }
  
@@ -186,8 +188,10 @@ public class adjustDetailController extends BaseController {
         Integer[] integers = Convert.toIntArray(ids);
         for (Integer id : integers){
             AdjustDetail adjustDetailEdit = adjustDetailService.getById(id);
+            if(StringUtils.isNotEmpty(adjustDetailEdit.getAgreeBy())){
+                return AjaxResult.error("明细已审批，请勿重复审批！");
+            }
             adjustDetailService.adjustAgree(adjustDetailEdit);
-
         }
         return AjaxResult.success("审批已下发！");
     }
@@ -73,6 +73,8 @@ public class AdjustDetailServiceImpl extends ServiceImpl&lt;AdjustDetailMapper, Adj
     @Override
     public AjaxResult addDetails(AdjustDetail adjustDetail) {
         //数据直接插入表里
+        //查询主单据
+
  
         //检查库存
         if((adjustDetail.getInventoryDetailId()) != null){
@@ -9,6 +9,7 @@ import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
@@ -17,6 +18,7 @@ import com.huaheng.pc.inventory.adjustDetail.service.AdjustDetailServiceImpl;
 import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader;
 import com.huaheng.pc.inventory.adjustHeader.service.AdjustHeaderService;
 import com.huaheng.pc.inventory.adjustHeader.service.AdjustHeaderServiceImpl;
+import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
  
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
  
 @Controller
@@ -86,7 +89,30 @@ public class adjustHeaderController extends BaseController {
         }
     }
  
+    /**
+     * 新增调整单主
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
  
+    /**
+     * 新增保存调整单主
+     */
+    //@RequiresPermissions("inventory:cycleCount:add")
+    @Log(title = "库存-调整",operating = "新增调整主单", action = BusinessType.INSERT)
+    @PostMapping("/addsave")
+    @ResponseBody
+    public AjaxResult addSave(AdjustHeader adjustHeader)
+    {
+        adjustHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        adjustHeader.setCreated(new Date());
+        adjustHeader.setCreatedBy(ShiroUtils.getLoginName());
+        adjustHeader.setCode(adjustHeaderService.createCode());
+        return toAjax(adjustHeaderService.save(adjustHeader));
+    }
  
  
  
@@ -5,26 +5,23 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
  
-        <form class="form-horizontal m" id="form-cyclecountAdjustDetail-addAdjust" >
-            <input type="hidden" id="cyclecountAdjustId" name="cyclecountAdjustId" th:value="${cyclecountAdjustId}">
-
+        <form class="form-horizontal m" id="form-adjustHeader-add" >
             <div class="form-group">
                 <label class="col-sm-3 control-label">调整单编号：</label>
                 <div class="col-sm-8">
-					<input id="code" name="code" th:value="${code}" class="form-control" type="text" readonly="readonly">
+					<input id="code" name="code" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">货主编码：</label>
                 <div class="col-sm-8">
-                    <input id="companyId" name="companyId" type="hidden" th:value="*{companyId}">
-                    <input id="companyCode" name="companyCode" th:value="${companyCode}" class="form-control" type="text" readonly="readonly">
+                    <input id="companyCode" name="companyCode" class="form-control" type="text" readonly="readonly">
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">盘点单编号：</label>
                 <div class="col-sm-8">
-                    <input id="cyclecountHeadCode" name="cyclecountHeadCode" th:value="${cyclecountHeadCode}" class="form-control" type="text" readonly="readonly">
+                    <input id="cyclecountHeadCode" name="cyclecountHeadCode" class="form-control" type="text" readonly="readonly">
                 </div>
             </div>
             <div class="form-group">
@@ -120,9 +117,9 @@
     </div>
     <div th:include="include::footer"></div>
     <script type="text/javascript">
-		var prefix = ctx + "inventory/cyclecountAdjustDetail"
+		var prefix = ctx + "inventory/adjustHeader"
  
-        $("#form-cyclecountAdjustDetail-addAdjust").validate({
+        $("#form-adjustHeader-add").validate({
             rules:{
                 materialCode:{
                     required:true,
@@ -149,7 +146,7 @@
                 //必须填值判定
             },
             submitHandler: function(form) {
-                $.operate.save(prefix + "/addAdjust", $('#form-cyclecountAdjustDetail-addAdjust').serialize());
+                $.operate.save(prefix + "/addsave", $('#form-adjustHeader-add').serialize());
             }
         });
  
@@ -214,7 +214,7 @@
  
     function cyclecountPrint(id) {
         var url = prefix + "/report/" + id;
-        $.modal.open("差异单打印", url);
+        $.modal.open("调整单打印", url);
     }