表单头创建时间添加默认创建时间

开始时间默认提前一周，结束时间默认当天

表单头创建时间添加默认创建时间
开始时间默认提前一周，结束时间默认当天
mahuandong
1 parent d8be3289
Showing 7 changed files with 64 additions and 86 deletions
src/main/java/com/huaheng/pc/check/checkDetail/controller/CheckDetailController.java
src/main/java/com/huaheng/pc/check/checkDetail/service/CheckDetailService.java
src/main/resources/application-druid.properties
src/main/resources/static/huaheng/js/common.js
src/main/resources/static/huaheng/js/huahengUI.js
src/main/resources/templates/check/checkHeader/checkHeader.html
src/main/resources/templates/include.html
@@ -130,15 +130,6 @@ public class CheckDetailController extends BaseController {
     }
  
     /**
-     * 完成质检
-     */
-    @GetMapping("complete/{id}")
-    public String complete(@PathVariable("id") Integer id, ModelMap mmap) {
-        mmap.put("checkDetailId", id);
-        return prefix + "/checkComplete";
-    }
-
-    /**
      * 保存质检完成
      * @param inventorySts 库存状态
      * @param qty 数量
@@ -149,9 +140,7 @@ public class CheckDetailController extends BaseController {
     @Log(title = "质检-质检详情 ",operating = "质检详情删除", action = BusinessType.DELETE)
     @PostMapping("/complete")
     @ResponseBody
-    public AjaxResult complete(@ApiParam(name="质检明细id",value="id")Integer id,
-                               @ApiParam(name="库存状态",value="inventorySts",example="good,bad")String inventorySts,
-                               @ApiParam(name = "数量",value = "qty",example = "10,20") String qty) {
-        return checkDetailService.complete(id, inventorySts, qty);
+    public AjaxResult complete(@ApiParam(name="质检明细id",value="id")Integer id) {
+        return checkDetailService.complete(id);
     }
 }
@@ -26,77 +26,58 @@ import org.springframework.transaction.annotation.Transactional;
 public class CheckDetailService extends ServiceImpl<CheckDetailMapper, CheckDetail> {
  
     @Resource
-    private CheckingRegisterService checkingRegisterService;
-    @Resource
     private CheckHeaderService checkHeaderService;
+    @Resource
+    private CheckingRegisterService checkingRegisterService;
  
     /**
      * 质检完成
      * @param id 质检明细id
-     * @param inventorySts 库存状态 good,
-     * @param qty 数量 10,20
      * @return AjaxResult
      */
     @Transactional
-    public AjaxResult complete(Integer id, String inventorySts, String qty){
+    public AjaxResult complete(Integer id){
+        LambdaQueryWrapper<CheckingRegister> checkingRegisterLambda = Wrappers.lambdaQuery();
+        checkingRegisterLambda.eq(CheckingRegister::getCheckDetailId, id);
+        List<CheckingRegister> checkingRegisters = checkingRegisterService.list(checkingRegisterLambda);
+        int total = 0; //质检登记中的总数量
+        for (CheckingRegister checkingRegister: checkingRegisters){
+            total += checkingRegister.getQty();
+        }
  
-        //将库存状态、数量字符串转为List
-        List<String> inventoryStsList = Arrays.asList(Convert.toStrArray(inventorySts));
-        List<Integer> qtyList = Arrays.asList(Convert.toIntArray(qty));
+        //更新传入明细id为完成质检状态
         CheckDetail checkDetail = this.getById(id);
-
-        //
-        int sum = 0;
-        for (Integer quantity : qtyList) {
-            sum += quantity;
-        }
-        if (checkDetail.getQty() == sum) {
-            AjaxResult.error("质检登记数量和质检明细系统数量核对错误");
+        if ( !(total == checkDetail.getQty())){
+            return AjaxResult.error("质检登记中总数量不等于质检明细中数量，不能完成质检");
         }
+        checkDetail.setCheckBy(ShiroUtils.getLoginName());
+        checkDetail.setCheckAt(new Date());
+
         checkDetail.setStatus("20");
-        if ( !this.updateById(checkDetail)){
-            throw new ServiceException("更新质检明细表错误");
+        checkDetail.setLastUpdated(new Date());
+        checkDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
+        if (!this.updateById(checkDetail)){
+            throw new ServiceException("更新质检明细表失败");
         }
-        CheckingRegister checkingRegister = new CheckingRegister();
-        checkingRegister.setCheckDetailId(checkDetail.getId());
-        checkingRegister.setCheckHeaderId(checkDetail.getCheckHeaderId());
-        checkingRegister.setWarehouseCode(ShiroUtils.getWarehouseCode());
-        checkingRegister.setCheckCode(checkDetail.getCheckCode());
-        checkingRegister.setReceiptDetailId(checkDetail.getReceiptDetailId());
-        checkingRegister.setReceiptCode(checkDetail.getReceiptCode());
-        checkingRegister.setReferCode(checkDetail.getReferCode());
-        checkingRegister.setReferLineId(checkDetail.getReferLineId());
-        checkingRegister.setReferPlatform(checkDetail.getReferPlatform());
-        checkingRegister.setMaterialCode(checkDetail.getMaterialCode());
-        checkingRegister.setMaterialName(checkDetail.getMaterialName());
-        checkingRegister.setMaterialSpec(checkDetail.getMaterialSpec());
-        checkingRegister.setMaterialUnit(checkDetail.getMaterialUnit());
-        checkingRegister.setCompanyCode(checkDetail.getCompanyCode());
-        checkingRegister.setCheckBy(ShiroUtils.getLoginName());
-        checkingRegister.setCheckAt(new Date());
-        checkingRegister.setCreatedBy(ShiroUtils.getLoginName());
-        checkingRegister.setLastUpdatedBy(ShiroUtils.getLoginName());
+        LambdaQueryWrapper<CheckDetail> lambda = Wrappers.lambdaQuery();
+        lambda.eq(CheckDetail::getCheckHeaderId, checkDetail.getCheckHeaderId());
+        List<CheckDetail> checkDetails = this.list(lambda);
  
-        for (int i = 0; i<inventoryStsList.size(); i++){
-            checkingRegister.setInventorySts(inventoryStsList.get(i));
-            checkingRegister.setQty(qtyList.get(0));
-            if ( !checkingRegisterService.save(checkingRegister)){
-                throw new ServiceException("生成质检报告失败");
+        //判断头表下所有明细是否全部完成
+        boolean result = false;
+        for (CheckDetail checkDetail1 : checkDetails){
+            if ("20".equals(checkDetail1.getStatus())){
+                result = true;
+            } else {
+                result = false;
             }
         }
-
-        LambdaQueryWrapper<CheckDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
-        lambdaQueryWrapper.eq(CheckDetail::getCheckHeaderId, checkDetail.getCheckHeaderId())
-                        .ne(CheckDetail::getStatus, 20);
-        List<CheckDetail> checkDetails = this.list(lambdaQueryWrapper);
-
-        //如果改质检单的全部明细都完成质检则更新质检头表状态
-        if (checkDetails == null){
+        if (result){
             CheckHeader checkHeader = new CheckHeader();
             checkHeader.setId(checkDetail.getCheckHeaderId());
-            checkHeader.setStatus("20");
-            if (!checkHeaderService.updateById(checkHeader)){
-                throw new ServiceException("更新质检头表发生错误");
+            checkHeader.setStatus("30");
+            if ( !checkHeaderService.updateById(checkHeader)){
+                throw new ServiceException("质检头表更新失败");
             }
         }
         return AjaxResult.success("质检完成");
@@ -2,14 +2,14 @@
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # \u4E3B\u5E93
-#spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
 #spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/huahengExample?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/wms2.0?characterEncoding=utf8&serverTimezone=GMT%2b8
+#spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/wms2.0?characterEncoding=utf8&serverTimezone=GMT%2b8
  
-#spring.datasource.druid.master.username=softhuaheng
-#spring.datasource.druid.master.password=HHrobot123.
-spring.datasource.druid.master.username=root
-spring.datasource.druid.master.password=123456
+spring.datasource.druid.master.username=softhuaheng
+spring.datasource.druid.master.password=HHrobot123.
+#spring.datasource.druid.master.username=root
+#spring.datasource.druid.master.password=123456
 # \u4ECE\u5E93
 #spring.datasource.druid.slave.open = true
 #spring.datasource.druid.slave.url=jdbc:mysql://172.16.29.45:3306/huaheng?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
@@ -21,8 +21,10 @@ $(function(){
 	if ($(".time").length > 0) {
 		layui.use('laydate', function() {
 		    var laydate = layui.laydate;
-		    laydate.render({ elem: '#startTime', theme: 'molv' });
-		    laydate.render({ elem: '#endTime', theme: 'molv' });
+            var day1 = new Date();
+            day1.setTime(day1.getTime()-24*60*60*1000*7);
+		    laydate.render({ elem: '#startTime', theme: 'molv',value: new Date(day1), isInitValue: true});
+		    laydate.render({ elem: '#endTime', theme: 'molv',value: new Date(), isInitValue: true });
 		});
 	}
 });
@@ -51,13 +51,17 @@
             },
             // 查询条件
             queryParams: function(params) {
+                var day1 = new Date();
+                day1.setTime(day1.getTime()-24*60*60*1000*7);
             	return {
         			// 传递参数查询参数
         			pageSize:       params.limit,
         			pageNum:        params.offset / params.limit + 1,
         			searchValue:    params.search,
         			orderByColumn:  params.sort,
-        			isAsc:          params.order
+        			isAsc:          params.order,
+                    createdBegin:      day1,
+                    createdEnd:        new Date()
         		}; 
             },
             // 请求获取数据后处理回调函数
@@ -103,8 +103,8 @@
                     </div>
  
                     <div class="btn-group hidden-xs" id="toolbarReg" role="group">
-                        <a class="btn btn-outline btn-danger btn-rounded" onclick="complete()" shiro:hasPermission="check:checkingRegister:remove">
-                            <i class="fa fa-trash-o"></i> 质检完成
+                        <a class="btn btn-outline btn-success btn-rounded" onclick="complete()" shiro:hasPermission="check:checkingRegister:remove">
+                            <i class="fa fa-check-circle-o"></i> 质检完成
                         </a>
                         <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="check:checkingRegister:remove">
                             <i class="fa fa-trash-o"></i> 删除
@@ -259,7 +259,6 @@
  
     //质检明细表格初始化
     $("#bootstrap-table1").bootstrapTable({
-        url: prefix + "/list",
         createUrl: prefix1 + "/add",
         updateUrl: prefix1 + "/edit/{id}",
         removeUrl: prefix1 + "/remove",
@@ -269,7 +268,6 @@
         sortOrder: "desc",
         iconSize: "outline",
         toolbar: "#toolbar1",
-        contentType: "application/x-www-form-urlencoded",
         pagination: true,   // 是否显示分页（*）
         pageNumber: 1,                                      // 初始化加载第一页，默认第一页
         pageSize: 50,                                       // 每页的记录行数（*）
@@ -282,11 +280,13 @@
         },
             {
                 field : 'id',
-                title : 'id'
+                title : 'id',
+                visible: false
             },
             {
                 field : 'checkHeaderId',
-                title : '质检头id'
+                title : '质检头id',
+                visible : false
             },
             {
                 field : 'warehouseCode',
@@ -299,7 +299,8 @@
             },
             {
                 field : 'inventoryDetailId',
-                title : '库存明细标识'
+                title : '库存明细标识',
+                visible : false
             },
             {
                 field : 'locationCode',
@@ -311,7 +312,8 @@
             },
             {
                 field : 'receiptDetailId',
-                title : '入库单明细标识'
+                title : '入库单明细标识',
+                visible : false
             },
             {
                 field : 'receiptCode',
@@ -402,7 +404,6 @@
     });
     //质检登记表格初始化
     $("#bootstrap-table2").bootstrapTable({
-        contentType: "application/x-www-form-urlencoded",
         editable: true,
         clickEdit: true,
         clickToSelect: true,
@@ -586,6 +587,7 @@
             });
         }
     });
+
     /* 质检单列表-详细 */
     function detail(id, code) {
         checkId = id;
@@ -647,6 +649,7 @@
  
     function complete() {
         var url = prefix1+"/complete";
+        var data = {id: checkDetailId};
         $.operate.submit(url, "post", "json", data);
     }
 </script>
@@ -20,7 +20,7 @@
 <div th:fragment="footer">
 	<script th:src="@{/js/jquery.min.js}"></script>
 	<script th:src="@{/js/bootstrap.min.js}"></script>
-	
+	<script th:src="@{/huaheng/js/common.js?v=2.3.0}"></script>
 	<!-- bootstrap-table 表格插件 -->
 	<script th:src="@{/ajax/libs/bootstrap-table/bootstrap-table.min.js}"></script>
 	<script th:src="@{/ajax/libs/bootstrap3-editable/js/bootstrap-editable.js}"></script>
@@ -42,7 +42,6 @@
 	<script th:src="@{/ajax/libs/layer/layer.min.js}"></script>
 	<script th:src="@{/ajax/libs/layui/layui.js}"></script>
 	<script th:src="@{/ajax/libs/layui/lay/modules/upload.js}"></script>
-	<script th:src="@{/huaheng/js/common.js?v=2.3.0}"></script>
 	<script th:src="@{/huaheng/js/huahengUI.js?v=2.3.2}"></script>
 	<script th:inline="javascript"> var ctx = [[@{/}]]; </script>
 </div>