调整单页面

xqs
1 parent 7caefe20
Showing 3 changed files with 18 additions and 18 deletions
src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
src/main/resources/templates/inventory/adjustDetail/adjustDetail.html
src/main/resources/templates/inventory/adjustHeader/adjustHeader.html
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
@@ -106,12 +107,12 @@ public class adjustDetailController extends BaseController {
      * 新增调整明细
      */
     @GetMapping("/add")
-    public String add(String adjustHeaderCode, ModelMap m)
+    public String add(String adjustCode, ModelMap m)
     {
-        if( adjustHeaderCode == null){
-            throw new SecurityException("调整单头编码不能为空！");
+        if( adjustCode == null){
+            throw new ServiceException("调整单头编码不能为空！");
         }
-        m.put("adjustHeaderCode",adjustHeaderCode);
+        m.put("adjustCode",adjustCode);
         return prefix + "/add";
     }
@@ -10,7 +10,7 @@
                 <form id="cycleHeader-form">
                     <ul>
                         <li>
-                            调整主单编码：<input type="text" id="adjustHCode" name="adjustCode"/>
+                            调整主单编码：<input type="text" id="adjustCode" name="adjustCode"/>
                         </li>
                         <li>
                             调整单明细ID：<input id="id" type="text" name="id"/>
@@ -151,7 +151,7 @@
                     sortable: true
                 },
                 {
-                    field: 'adjustHeaderCode',
+                    field: 'adjustCode',
                     title: '调整主单编码',
                     visible: true
                 },
@@ -171,11 +171,11 @@
                     title: '货主'
                 },
                 {
-                    field: 'cycleCountCode',
+                    field: 'cycleCountHeaderCode',
                     title: '盘点单编码',
                 },
                 {
-                    field: 'cycleDetailId',
+                    field: 'cycleCountDetailId',
                     title: '盘点单明细ID',
                     sortable: true,
                     visible: true
@@ -367,12 +367,12 @@
         if (url.indexOf("?") != -1) {    //判断是否有参数
             let str = url.substr(1); //从第一个字符开始 因为第0个是?号 获取所有除问号的所有符串
             let strs = url.substr(1).split("=");
-            $("#adjustHeaderCode").val(strs[1]);
+            $("#adjustCode").val(strs[1]);
             options.queryParams=function(params) {
                 return {
                     // 传递参数查询参数
-                    adjustHeaderCode:     strs[1],
+                    adjustCode:     strs[1],
                     pageSize:       params.limit,
                     pageNum:        params.offset / params.limit + 1,
                     searchValue:    params.search,
@@ -380,7 +380,7 @@
                     isAsc:          params.order
                 };
             };
-            adjustHeaderCode=str.split("=")[1];
+            adjustCode=str.split("=")[1];
             $.table.init(options);
         }
         else{
@@ -389,12 +389,11 @@
     });
-
     /*新增调整明细*/
     function add() {
-        var adjustCode = $('#adjustHeaderCode').val();
-        if(adjustCode !=null && adjustCode!="" && adjustCode!=undefined){
-            open("新增调整明细", prefix+"/add?adjustHeaderCode=" + adjustCode);
+        var adjustCode = $('#adjustCode').val();
+        if(adjustCode != null && adjustCode != "" && adjustCode != undefined){
+            open("新增调整明细", prefix+"/add?adjustCode=" + adjustCode);
         }
     }
@@ -21,7 +21,7 @@
             <div id="myTabContent" class="tab-content">
                 <div class="tab-pane fade in active" id="tabHeader">
                     <div class="col-sm-12 select-info">
-                        <form id="cycleHeader-form">
+                        <form id="adjustHeader-form">
                             <div class="select-list">
                                 <ul>
                                     <li>
@@ -61,7 +61,7 @@
                                     <li>
                                         <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
                                                 class="fa fa-search"></i>&nbsp;搜索</a>
-                                        <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('cycleHeader-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                        <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('adjustHeader-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                                     </li>
                                 </ul>
                             </div>
@@ -128,7 +128,7 @@
                     title: '货主编码'
                 },
                 {
-                    field: 'cycleCountCode',
+                    field: 'cycleCountHeaderCode',
                     title: '盘点单编码'
                 },
                 {