From 16df414db25bf21058077e37ad3bc28bba1cbb10 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期日, 08 八月 2021 15:52:43 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/DocLogMapper.xml | 19 +
src/main/webapp/views/docLog/docLog.html | 122 ++++++++
src/main/java/zy/cloud/wms/common/service/erp/ErpService.java | 23 +
src/main/java/zy/cloud/wms/manager/controller/DocLogController.java | 123 ++++++++
src/main/java/zy/cloud/wms/manager/entity/DocLog.java | 200 ++++++++++++++
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 47 +++
src/main/java/zy/cloud/wms/manager/mapper/DocLogMapper.java | 12
src/main/java/zy/cloud/wms/manager/service/impl/DocLogServiceImpl.java | 12
src/main/java/zy/cloud/wms/manager/service/DocLogService.java | 8
src/main/java/zy/cloud/wms/common/CodeBuilder.java | 2
src/main/resources/application.yml | 2
src/main/webapp/static/js/docLog/docLog.js | 251 +++++++++++++++++
12 files changed, 818 insertions(+), 3 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/CodeBuilder.java b/src/main/java/zy/cloud/wms/common/CodeBuilder.java
index 14123e1..4b0e964 100644
--- a/src/main/java/zy/cloud/wms/common/CodeBuilder.java
+++ b/src/main/java/zy/cloud/wms/common/CodeBuilder.java
@@ -15,7 +15,7 @@
// generator.password="xltys1995";
// generator.table="sys_host";
// sqlserver
- generator.url="localhost:1433;databasename=htwms";
+ generator.url="localhost:1433;databasename=htasrs";
generator.username="sa";
generator.password="sa@123";
generator.table="erp_doc_log";
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index 9a1378a..372581a 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -63,6 +63,8 @@
private PakoutService pakoutService;
@Autowired
private NodeService nodeService;
+ @Autowired
+ private DocLogService docLogService;
/**
* 鍟嗗搧涓嬭浇
@@ -544,6 +546,7 @@
// @PostConstruct
public void finishOrdersExecute(){
try {
+ Date now = new Date();
List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4).isNotNull("number"));
if (!Cools.isEmpty(orders)) {
List<String> orderNos = orders.stream().map(Order::getOrderNo).distinct().collect(Collectors.toList());
@@ -552,6 +555,8 @@
List<GetOrderResultDetl0> list = new ArrayList<>();
getOrderResult0.setDetail(list);
+ // 鏃ュ織
+ List<DocLog> docLogs = new ArrayList<>();
// 澶�
getOrderResult0.setNumber(order.getOrderNo());
@@ -573,6 +578,18 @@
detl0.setUnit(orderDetl.getUnit());
detl0.setRowNo(Integer.parseInt(orderDetl.getName()));
list.add(detl0);
+
+ // 鏃ュ織
+ docLogs.add(new DocLog(
+ order.getOrderNo(), // 鍗曟嵁缂栧彿
+ 11L, // 鍗曟嵁绫诲瀷
+ "閿�鍞鍗�", // 鍗曟嵁鍚嶇О
+ orderDetl.getMatnr(), // 鍟嗗搧缂栧彿
+ orderDetl.getCount(), // 涓婃姤鏁伴噺
+ 1, // 缁撴灉
+ now, // 涓婃姤鏃堕棿
+ null // 澶囨敞
+ ));
}
log.warn(JSON.toJSONString(getOrderResult0));
@@ -583,6 +600,13 @@
.setJson(JSON.toJSONString(getOrderResult0))
.build()
.doPost();
+
+ try {
+ docLogService.insertBatch(docLogs);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ }
+
if (!Cools.isEmpty(response)) {
log.warn(response);
Result result = JSON.parseObject(response, Result.class);
@@ -621,6 +645,7 @@
// @PostConstruct
public void finishOrders0Execute(){
try {
+ Date now = new Date();
List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4).eq("doc_type", 6));
if (!Cools.isEmpty(orders)) {
List<String> orderNos = orders.stream().map(Order::getOrderNo).distinct().collect(Collectors.toList());
@@ -629,6 +654,8 @@
List<GetOrderResultDetl0> list = new ArrayList<>();
getOrderResult0.setDetail(list);
+ // 鏃ュ織
+ List<DocLog> docLogs = new ArrayList<>();
// 澶�
getOrderResult0.setNumber(order.getOrderNo());
@@ -651,10 +678,21 @@
detl0.setUnit(orderDetl.getUnit());
detl0.setComment(orderDetl.getMemo());
list.add(detl0);
+
+ // 鏃ュ織
+ docLogs.add(new DocLog(
+ order.getOrderNo(), // 鍗曟嵁缂栧彿
+ 6L, // 鍗曟嵁绫诲瀷
+ "閲囪喘閫�璐ц鍗�", // 鍗曟嵁鍚嶇О
+ orderDetl.getMatnr(), // 鍟嗗搧缂栧彿
+ orderDetl.getCount(), // 涓婃姤鏁伴噺
+ 1, // 缁撴灉
+ now, // 涓婃姤鏃堕棿
+ null // 澶囨敞
+ ));
}
System.out.println(JSON.toJSONString(getOrderResult0));
-
String response = new HttpHandler.Builder()
.setUri(URI)
@@ -662,6 +700,13 @@
.setJson(JSON.toJSONString(getOrderResult0))
.build()
.doPost();
+
+ try {
+ docLogService.insertBatch(docLogs);
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ }
+
if (!Cools.isEmpty(response)) {
log.warn(response);
Result result = JSON.parseObject(response, Result.class);
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
index 6a537e9..c8e216e 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
@@ -9,9 +9,11 @@
import zy.cloud.wms.common.model.BillDto;
import zy.cloud.wms.common.service.erp.entity.UploadBill;
import zy.cloud.wms.common.service.erp.entity.UploadBillDetail;
+import zy.cloud.wms.manager.entity.DocLog;
import zy.cloud.wms.manager.entity.DocType;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.entity.RequestLog;
+import zy.cloud.wms.manager.service.DocLogService;
import zy.cloud.wms.manager.service.DocTypeService;
import zy.cloud.wms.manager.service.MatService;
import zy.cloud.wms.manager.service.RequestLogService;
@@ -34,11 +36,15 @@
private MatService matService;
@Autowired
private RequestLogService requestLogService;
+ @Autowired
+ private DocLogService docLogService;
+
/**
* 鍗曟嵁涓婃姤
*/
public ErpR uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
try {
+ Date now = new Date();
if (Cools.isEmpty(dtos)) {
return new ErpR(false, null);
}
@@ -46,6 +52,9 @@
if (Cools.isEmpty(docType)) {
return new ErpR(false, null);
}
+
+ // 鏃ュ織
+ List<DocLog> docLogs = new ArrayList<>();
UploadBill uploadBill = new UploadBill();
uploadBill.setNumber(docNumber);
@@ -69,6 +78,18 @@
detl.setPrice(0);
detl.setUnit(mat==null?"鏆傛棤":mat.getUnit());
detail.add(detl);
+
+ // 鏃ュ織
+ docLogs.add(new DocLog(
+ docNumber, // 鍗曟嵁缂栧彿
+ docId.longValue(), // 鍗曟嵁绫诲瀷
+ null, // 鍗曟嵁鍚嶇О
+ dto.getMatnr(), // 鍟嗗搧缂栧彿
+ dto.getQty(), // 涓婃姤鏁伴噺
+ 1, // 缁撴灉
+ now, // 涓婃姤鏃堕棿
+ null // 澶囨敞
+ ));
}
log.warn(JSON.toJSONString(uploadBill));
String response = new HttpHandler.Builder()
@@ -79,6 +100,8 @@
.doPost();
try {
+ docLogService.insertBatch(docLogs);
+
// 鏃ュ織璁板綍
RequestLog logInfo = new RequestLog();
logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + docId);
diff --git a/src/main/java/zy/cloud/wms/manager/controller/DocLogController.java b/src/main/java/zy/cloud/wms/manager/controller/DocLogController.java
new file mode 100644
index 0000000..0a63b1c
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/controller/DocLogController.java
@@ -0,0 +1,123 @@
+package zy.cloud.wms.manager.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 zy.cloud.wms.manager.entity.DocLog;
+import zy.cloud.wms.manager.service.DocLogService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import zy.cloud.wms.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class DocLogController extends BaseController {
+
+ @Autowired
+ private DocLogService docLogService;
+
+ @RequestMapping(value = "/docLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(docLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/docLog/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<DocLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(docLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/docLog/add/auth")
+ @ManagerAuth
+ public R add(DocLog docLog) {
+ docLogService.insert(docLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/docLog/update/auth")
+ @ManagerAuth
+ public R update(DocLog docLog){
+ if (Cools.isEmpty(docLog) || null==docLog.getId()){
+ return R.error();
+ }
+ docLogService.updateById(docLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/docLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ docLogService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/docLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<DocLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("docLog"));
+ convert(map, wrapper);
+ List<DocLog> list = docLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/docLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<DocLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<DocLog> page = docLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (DocLog docLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", docLog.getId());
+ map.put("value", docLog.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/docLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<DocLog> wrapper = new EntityWrapper<DocLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != docLogService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(DocLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/DocLog.java b/src/main/java/zy/cloud/wms/manager/entity/DocLog.java
new file mode 100644
index 0000000..77062c7
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/DocLog.java
@@ -0,0 +1,200 @@
+package zy.cloud.wms.manager.entity;
+
+import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModelProperty;
+
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@TableName("erp_doc_log")
+public class DocLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ private Long id;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableField("doc_num")
+ private String docNum;
+
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @TableField("doc_id")
+ private Long docId;
+
+ /**
+ * 鍗曟嵁鍚嶇О
+ */
+ @ApiModelProperty(value= "鍗曟嵁鍚嶇О")
+ @TableField("doc_name")
+ private String docName;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ /**
+ * 涓婃姤鏁伴噺
+ */
+ @ApiModelProperty(value= "涓婃姤鏁伴噺")
+ private Double qua;
+
+ /**
+ * 缁撴灉 1: 鎴愬姛 0: 澶辫触
+ */
+ @ApiModelProperty(value= "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
+ private Integer success;
+
+ /**
+ * 涓婃姤鏃堕棿
+ */
+ @ApiModelProperty(value= "涓婃姤鏃堕棿")
+ @TableField("send_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public DocLog() {}
+
+ public DocLog(String docNum,Long docId,String docName,String matnr,Double qua,Integer success,Date sendTime,String memo) {
+ this.docNum = docNum;
+ this.docId = docId;
+ this.docName = docName;
+ this.matnr = matnr;
+ this.qua = qua;
+ this.success = success;
+ this.sendTime = sendTime;
+ this.memo = memo;
+ }
+
+// DocLog docLog = new DocLog(
+// null, // 鍗曟嵁缂栧彿
+// null, // 鍗曟嵁绫诲瀷
+// null, // 鍗曟嵁鍚嶇О
+// null, // 鍟嗗搧缂栧彿
+// null, // 涓婃姤鏁伴噺
+// null, // 缁撴灉
+// null, // 涓婃姤鏃堕棿
+// null // 澶囨敞
+// );
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getDocNum() {
+ return docNum;
+ }
+
+ public void setDocNum(String docNum) {
+ this.docNum = docNum;
+ }
+
+ public Long getDocId() {
+ return docId;
+ }
+
+ public void setDocId(Long docId) {
+ this.docId = docId;
+ }
+
+ public String getDocName() {
+ return docName;
+ }
+
+ public void setDocName(String docName) {
+ this.docName = docName;
+ }
+
+ public String getMatnr() {
+ return matnr;
+ }
+
+ public void setMatnr(String matnr) {
+ this.matnr = matnr;
+ }
+
+ public Double getQua() {
+ return qua;
+ }
+
+ public void setQua(Double qua) {
+ this.qua = qua;
+ }
+
+ public Integer getSuccess() {
+ return success;
+ }
+
+ public String getSuccess$(){
+ if (null == this.success){ return null; }
+ switch (this.success){
+ case 1:
+ return "鎴愬姛";
+ case 0:
+ return "澶辫触";
+ default:
+ return String.valueOf(this.success);
+ }
+ }
+
+ public void setSuccess(Integer success) {
+ this.success = success;
+ }
+
+ public Date getSendTime() {
+ return sendTime;
+ }
+
+ public String getSendTime$(){
+ if (Cools.isEmpty(this.sendTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
+ }
+
+ public void setSendTime(Date sendTime) {
+ this.sendTime = sendTime;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/DocLogMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/DocLogMapper.java
new file mode 100644
index 0000000..f14fe14
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/mapper/DocLogMapper.java
@@ -0,0 +1,12 @@
+package zy.cloud.wms.manager.mapper;
+
+import zy.cloud.wms.manager.entity.DocLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface DocLogMapper extends BaseMapper<DocLog> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/DocLogService.java b/src/main/java/zy/cloud/wms/manager/service/DocLogService.java
new file mode 100644
index 0000000..ff6114e
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/DocLogService.java
@@ -0,0 +1,8 @@
+package zy.cloud.wms.manager.service;
+
+import zy.cloud.wms.manager.entity.DocLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface DocLogService extends IService<DocLog> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/DocLogServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/DocLogServiceImpl.java
new file mode 100644
index 0000000..940ae6d
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/DocLogServiceImpl.java
@@ -0,0 +1,12 @@
+package zy.cloud.wms.manager.service.impl;
+
+import zy.cloud.wms.manager.mapper.DocLogMapper;
+import zy.cloud.wms.manager.entity.DocLog;
+import zy.cloud.wms.manager.service.DocLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("docLogService")
+public class DocLogServiceImpl extends ServiceImpl<DocLogMapper, DocLog> implements DocLogService {
+
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9f455f0..bcd0113 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,7 +14,7 @@
# password: xltys1995
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.1.56:1433;databasename=htasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=htasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/DocLogMapper.xml b/src/main/resources/mapper/DocLogMapper.xml
new file mode 100644
index 0000000..8a20fa1
--- /dev/null
+++ b/src/main/resources/mapper/DocLogMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="zy.cloud.wms.manager.mapper.DocLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="zy.cloud.wms.manager.entity.DocLog">
+ <id column="id" property="id" />
+ <result column="doc_num" property="docNum" />
+ <result column="doc_id" property="docId" />
+ <result column="doc_name" property="docName" />
+ <result column="matnr" property="matnr" />
+ <result column="qua" property="qua" />
+ <result column="success" property="success" />
+ <result column="send_time" property="sendTime" />
+ <result column="memo" property="memo" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/docLog/docLog.js b/src/main/webapp/static/js/docLog/docLog.js
new file mode 100644
index 0000000..eb8bfa2
--- /dev/null
+++ b/src/main/webapp/static/js/docLog/docLog.js
@@ -0,0 +1,251 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#docLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/docLog/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: 'ID', hide: true}
+ ,{field: 'docNum', align: 'center',title: '鍗曟嵁缂栧彿'}
+ ,{field: 'docId', align: 'center',title: '鍗曟嵁绫诲瀷'}
+ ,{field: 'docName', align: 'center',title: '鍗曟嵁鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'qua', align: 'center',title: '涓婃姤鏁伴噺'}
+ ,{field: 'success$', align: 'center',title: '缁撴灉', hide: true}
+ ,{field: 'sendTime$', align: 'center',title: '涓婃姤鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(docLog)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(docLog)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ var ids = checkStatus.map(function (d) {
+ return d.id;
+ });
+ del(ids);
+ break;
+ case 'exportData':
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'docLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/docLog/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(docLog)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ var ids = [data.id];
+ del(ids);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender();
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/docLog/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/docLog/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ 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});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender() {
+ layDate.render({
+ elem: '#sendTime\\$',
+ type: 'datetime'
+ });
+
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/docLog/docLog.html b/src/main/webapp/views/docLog/docLog.html
new file mode 100644
index 0000000..32be12c
--- /dev/null
+++ b/src/main/webapp/views/docLog/docLog.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 鎼滅储鏍� -->
+<div id="search-box" class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <!-- 寰呮坊鍔� -->
+ <div id="data-search-btn" class="layui-btn-container layui-form-item">
+ <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+ <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="docLog" lay-filter="docLog"></table>
+</div>
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
+ </div>
+</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>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/docLog/docLog.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曟嵁缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="docNum" placeholder="璇疯緭鍏ュ崟鎹紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曟嵁绫诲瀷: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="docId" placeholder="璇疯緭鍏ュ崟鎹被鍨�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曟嵁鍚嶇О: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="docName" placeholder="璇疯緭鍏ュ崟鎹悕绉�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍟嗗搧缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓婃姤鏁伴噺: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="qua" placeholder="璇疯緭鍏ヤ笂鎶ユ暟閲�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">缁撴灉: </label>
+ <div class="layui-input-block">
+ <select name="success">
+ <option value="">璇烽�夋嫨缁撴灉</option>
+ <option value="1">鎴愬姛</option>
+ <option value="0">澶辫触</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓婃姤鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sendTime" id="sendTime$" placeholder="璇疯緭鍏ヤ笂鎶ユ椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1