From 9f4598c2203fb933264eed6910da90ebec5377f3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 29 一月 2023 08:45:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/CheckRecord.java | 42 +++++++++++++++++----
src/main/java/com/zy/asrs/controller/CheckRecordController.java | 26 ++++++++++--
src/main/webapp/views/checkRecord/checkRecord.html | 22 ++++++++++-
src/main/resources/mapper/CheckRecordMapper.xml | 1
src/main/webapp/static/js/checkRecord/checkRecord.js | 29 ++++++++++++++
5 files changed, 104 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CheckRecordController.java b/src/main/java/com/zy/asrs/controller/CheckRecordController.java
index d8dbe61..ff128ce 100644
--- a/src/main/java/com/zy/asrs/controller/CheckRecordController.java
+++ b/src/main/java/com/zy/asrs/controller/CheckRecordController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.CheckRecord;
-import com.zy.asrs.service.CheckRecordService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.CheckRecord;
+import com.zy.asrs.service.CheckRecordService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class CheckRecordController extends BaseController {
@@ -87,6 +89,20 @@
return R.ok();
}
+ @RequestMapping(value = "/checkRecord/auditing/auth")
+ @ManagerAuth
+ public R auditing(Long id){
+ CheckRecord checkRecord = checkRecordService.selectById(id);
+ if (Cools.isEmpty(checkRecord)) {
+ return R.error();
+ }
+ checkRecord.setStatus(1);
+ if (!checkRecordService.updateById(checkRecord)) {
+ return R.error();
+ }
+ return R.ok();
+ }
+
@RequestMapping(value = "/checkRecord/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
diff --git a/src/main/java/com/zy/asrs/entity/CheckRecord.java b/src/main/java/com/zy/asrs/entity/CheckRecord.java
index 06a8403..ed0a0ac 100644
--- a/src/main/java/com/zy/asrs/entity/CheckRecord.java
+++ b/src/main/java/com/zy/asrs/entity/CheckRecord.java
@@ -1,24 +1,31 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.zy.common.utils.Synchro;
-import org.springframework.format.annotation.DateTimeFormat;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("asr_check_record")
public class CheckRecord implements Serializable {
private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
/**
* 搴撲綅鍙�
@@ -83,6 +90,12 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
+ /**
+ * 鐘舵�� 1: 宸插鏍� 0: 鏈鏍�
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 宸插鏍� 0: 鏈鏍� ")
+ private Integer status;
+
public CheckRecord() {}
public CheckRecord(String locNo,String barcode,String matnr,String maktx,String specs,String batch,Double anfme,Double confirmQty,Date createTime) {
@@ -127,4 +140,17 @@
return null;
}
}
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "宸插鏍�";
+ case 0:
+ return "鏈鏍�";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
}
diff --git a/src/main/resources/mapper/CheckRecordMapper.xml b/src/main/resources/mapper/CheckRecordMapper.xml
index b6aede8..dd878bf 100644
--- a/src/main/resources/mapper/CheckRecordMapper.xml
+++ b/src/main/resources/mapper/CheckRecordMapper.xml
@@ -4,6 +4,7 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.CheckRecord">
+ <id column="id" property="id" />
<result column="loc_no" property="locNo" />
<result column="barcode" property="barcode" />
<result column="matnr" property="matnr" />
diff --git a/src/main/webapp/static/js/checkRecord/checkRecord.js b/src/main/webapp/static/js/checkRecord/checkRecord.js
index 6eecd85..bd32afd 100644
--- a/src/main/webapp/static/js/checkRecord/checkRecord.js
+++ b/src/main/webapp/static/js/checkRecord/checkRecord.js
@@ -31,7 +31,8 @@
,{field: 'anfme', align: 'center',title: '鐩樼偣鍓嶆暟閲�'}
,{field: 'confirmQty', align: 'center',title: '鐩樼偣纭閲�'}
,{field: 'adjQty$', align: 'center',title: '鐩樼偣宸紓閲�'}
- ,{field: 'createTime$', align: 'center',title: '璁板綍鏃堕棿'}
+ ,{field: 'createTime$', align: 'center',title: '璁板綍鏃堕棿', width: 180}
+ ,{field: 'type', align: 'center',title: '璐㈠姟瀹℃牳', templet: '#statusTpl', width: 100}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
@@ -139,6 +140,32 @@
case "del":
del([data.locNo]);
break;
+ case "auditing":
+ layer.confirm('纭畾瀹℃牳閫氳繃锛�', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/checkRecord/auditing/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {id: data.id},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ break
}
});
diff --git a/src/main/webapp/views/checkRecord/checkRecord.html b/src/main/webapp/views/checkRecord/checkRecord.html
index 52a8b1c..a9053df 100644
--- a/src/main/webapp/views/checkRecord/checkRecord.html
+++ b/src/main/webapp/views/checkRecord/checkRecord.html
@@ -32,6 +32,16 @@
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璐㈠姟瀹℃牳:</label>
+ <div class="layui-input-inline">
+ <select name="status">
+ <option value="">閫夋嫨鐘舵��</option>
+ <option value="0">鏈鏍�</option>
+ <option value="1">宸插鏍�</option>
+ </select>
+ </div>
+ </div>
<div class="layui-inline"> 
<button class="layui-btn icon-btn" lay-filter="search" lay-submit>
<i class="layui-icon"></i>鎼滅储
@@ -56,8 +66,16 @@
</script>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ {{# if( d.status === 0 ){ }}
+ <a class="layui-btn layui-btn-xs" lay-event="auditing">璐㈠姟瀹℃牳</a>
+ {{# } }}
+</script>
+<script type="text/html" id="statusTpl">
+ {{# if( d.status === 1 ){ }}
+ <span name="status" class="layui-badge layui-badge-green">宸插鏍�</span>
+ {{# } else if(d.status === 0){ }}
+ <span name="status" class="layui-badge layui-badge-red">鏈鏍�</span>
+ {{# } }}
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
--
Gitblit v1.9.1