From e1749547c76a5d8bae94e47d38d4d75b481610c1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 09 九月 2021 10:51:15 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/mapper/DiffLogMapper.java | 12
src/main/java/zy/cloud/wms/manager/service/impl/DiffLogServiceImpl.java | 12
src/main/java/zy/cloud/wms/common/service/task/DetectionScheduler.java | 32 +
src/main/java/zy/cloud/wms/manager/controller/DiffLogController.java | 123 +++++++++
src/main/java/zy/cloud/wms/manager/service/DiffLogService.java | 8
src/main/webapp/static/js/diffLog/diffLog.js | 251 +++++++++++++++++++
src/main/java/zy/cloud/wms/common/CodeBuilder.java | 2
src/main/java/zy/cloud/wms/manager/entity/DiffLog.java | 191 ++++++++++++++
src/main/webapp/views/diffLog/diffLog.html | 118 +++++++++
src/main/resources/mapper/DiffLogMapper.xml | 19 +
10 files changed, 758 insertions(+), 10 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/CodeBuilder.java b/src/main/java/zy/cloud/wms/common/CodeBuilder.java
index 4b0e964..a956c07 100644
--- a/src/main/java/zy/cloud/wms/common/CodeBuilder.java
+++ b/src/main/java/zy/cloud/wms/common/CodeBuilder.java
@@ -18,7 +18,7 @@
generator.url="localhost:1433;databasename=htasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="erp_doc_log";
+ generator.table="erp_diff_log";
generator.packagePath="zy.cloud.wms.manager";
// generator.js = false;
// generator.html = false;
diff --git a/src/main/java/zy/cloud/wms/common/service/task/DetectionScheduler.java b/src/main/java/zy/cloud/wms/common/service/task/DetectionScheduler.java
index 4260dac..3b91fee 100644
--- a/src/main/java/zy/cloud/wms/common/service/task/DetectionScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/task/DetectionScheduler.java
@@ -7,10 +7,13 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import zy.cloud.wms.manager.entity.DiffLog;
import zy.cloud.wms.manager.entity.DocLog;
+import zy.cloud.wms.manager.service.DiffLogService;
import zy.cloud.wms.manager.service.DocLogService;
import zy.cloud.wms.manager.service.MatService;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -23,17 +26,18 @@
public class DetectionScheduler {
@Autowired
- private MatService matService;
- @Autowired
private JdbcTemplate jdbcTemplate;
@Autowired
private DocLogService docLogService;
+ @Autowired
+ private DiffLogService diffLogService;
/**
* 璁㈠崟杞巻鍙叉。澶勭悊鍣�
*/
- @Scheduled(cron = "0/10 * * * * ? ")
+ @Scheduled(cron = "0 0 1 * * ?")
public void orderBeLogExecute(){
+ Date now = new Date();
List<String> matnrList = jdbcTemplate.queryForList("select distinct matnr from man_mat", String.class);
for (String matnr : matnrList) {
// 鏌ユ壘绔嬪簱搴撳瓨
@@ -49,22 +53,20 @@
for (DocLog docLog : docLogs) {
// 闃叉閲嶅鍗曟嵁
if (set.contains(docLog.getDocNum())) {
- break;
+ continue;
}
set.add(docLog.getDocNum());
int docId = Math.toIntExact(docLog.getDocId());
// 璁＄畻搴撳瓨
switch (docId) {
case 6:
-
- break;
case 9:
- break;
case 11:
+ stock = stock - docLog.getQua();
break;
case 14:
- break;
case 34:
+ stock = stock + docLog.getQua();
break;
default:
break;
@@ -72,7 +74,19 @@
}
// 姣旇緝宸紓鍊�
if (stock != total) {
- // todo
+ DiffLog diffLog = new DiffLog(
+ matnr, // 鍟嗗搧缂栧彿[闈炵┖]
+ stock, // erp鏁伴噺
+ total, // wms鏁伴噺
+ asrsAnfme, // 绔嬪簱
+ wmsAnfme, // 骞充粨
+ Math.abs(total-stock), // 宸紓鍊�
+ now, // 娣诲姞浜嬩欢
+ null // 澶囨敞
+ );
+ if (!diffLogService.insert(diffLog)) {
+ log.error("{}鍟嗗搧鏁伴噺宸紓锛佷笖淇濆瓨澶辫触锛�", matnr);
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/DiffLogController.java b/src/main/java/zy/cloud/wms/manager/controller/DiffLogController.java
new file mode 100644
index 0000000..fe83b11
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/controller/DiffLogController.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.DiffLog;
+import zy.cloud.wms.manager.service.DiffLogService;
+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 DiffLogController extends BaseController {
+
+ @Autowired
+ private DiffLogService diffLogService;
+
+ @RequestMapping(value = "/diffLog/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(diffLogService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/diffLog/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<DiffLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(diffLogService.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 = "/diffLog/add/auth")
+ @ManagerAuth
+ public R add(DiffLog diffLog) {
+ diffLogService.insert(diffLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/diffLog/update/auth")
+ @ManagerAuth
+ public R update(DiffLog diffLog){
+ if (Cools.isEmpty(diffLog) || null==diffLog.getId()){
+ return R.error();
+ }
+ diffLogService.updateById(diffLog);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/diffLog/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ diffLogService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/diffLog/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<DiffLog> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("diffLog"));
+ convert(map, wrapper);
+ List<DiffLog> list = diffLogService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/diffLogQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<DiffLog> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<DiffLog> page = diffLogService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (DiffLog diffLog : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", diffLog.getId());
+ map.put("value", diffLog.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/diffLog/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<DiffLog> wrapper = new EntityWrapper<DiffLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != diffLogService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(DiffLog.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/DiffLog.java b/src/main/java/zy/cloud/wms/manager/entity/DiffLog.java
new file mode 100644
index 0000000..93961e6
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/DiffLog.java
@@ -0,0 +1,191 @@
+package zy.cloud.wms.manager.entity;
+
+import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+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 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_diff_log")
+public class DiffLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ /**
+ * erp鏁伴噺
+ */
+ @ApiModelProperty(value= "erp鏁伴噺")
+ @TableField("doc_count")
+ private Double docCount;
+
+ /**
+ * wms鏁伴噺
+ */
+ @ApiModelProperty(value= "wms鏁伴噺")
+ private Double stock;
+
+ /**
+ * 绔嬪簱
+ */
+ @ApiModelProperty(value= "绔嬪簱")
+ @TableField("asrs_count")
+ private Double asrsCount;
+
+ /**
+ * 骞充粨
+ */
+ @ApiModelProperty(value= "骞充粨")
+ @TableField("wms_count")
+ private Double wmsCount;
+
+ /**
+ * 宸紓鍊�
+ */
+ @ApiModelProperty(value= "宸紓鍊�")
+ private Double diff;
+
+ /**
+ * 娣诲姞浜嬩欢
+ */
+ @ApiModelProperty(value= "娣诲姞浜嬩欢")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public DiffLog() {}
+
+ public DiffLog(String matnr,Double docCount,Double stock,Double asrsCount,Double wmsCount,Double diff,Date createTime,String memo) {
+ this.matnr = matnr;
+ this.docCount = docCount;
+ this.stock = stock;
+ this.asrsCount = asrsCount;
+ this.wmsCount = wmsCount;
+ this.diff = diff;
+ this.createTime = createTime;
+ this.memo = memo;
+ }
+
+// DiffLog diffLog = new DiffLog(
+// null, // 鍟嗗搧缂栧彿[闈炵┖]
+// null, // erp鏁伴噺
+// null, // wms鏁伴噺
+// null, // 绔嬪簱
+// null, // 骞充粨
+// null, // 宸紓鍊�
+// null, // 娣诲姞浜嬩欢
+// null // 澶囨敞
+// );
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getMatnr() {
+ return matnr;
+ }
+
+ public void setMatnr(String matnr) {
+ this.matnr = matnr;
+ }
+
+ public Double getDocCount() {
+ return docCount;
+ }
+
+ public void setDocCount(Double docCount) {
+ this.docCount = docCount;
+ }
+
+ public Double getStock() {
+ return stock;
+ }
+
+ public void setStock(Double stock) {
+ this.stock = stock;
+ }
+
+ public Double getAsrsCount() {
+ return asrsCount;
+ }
+
+ public void setAsrsCount(Double asrsCount) {
+ this.asrsCount = asrsCount;
+ }
+
+ public Double getWmsCount() {
+ return wmsCount;
+ }
+
+ public void setWmsCount(Double wmsCount) {
+ this.wmsCount = wmsCount;
+ }
+
+ public Double getDiff() {
+ return diff;
+ }
+
+ public void setDiff(Double diff) {
+ this.diff = diff;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/DiffLogMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/DiffLogMapper.java
new file mode 100644
index 0000000..90346d7
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/mapper/DiffLogMapper.java
@@ -0,0 +1,12 @@
+package zy.cloud.wms.manager.mapper;
+
+import zy.cloud.wms.manager.entity.DiffLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface DiffLogMapper extends BaseMapper<DiffLog> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/DiffLogService.java b/src/main/java/zy/cloud/wms/manager/service/DiffLogService.java
new file mode 100644
index 0000000..4b56e75
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/DiffLogService.java
@@ -0,0 +1,8 @@
+package zy.cloud.wms.manager.service;
+
+import zy.cloud.wms.manager.entity.DiffLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface DiffLogService extends IService<DiffLog> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/DiffLogServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/DiffLogServiceImpl.java
new file mode 100644
index 0000000..c59f32c
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/DiffLogServiceImpl.java
@@ -0,0 +1,12 @@
+package zy.cloud.wms.manager.service.impl;
+
+import zy.cloud.wms.manager.mapper.DiffLogMapper;
+import zy.cloud.wms.manager.entity.DiffLog;
+import zy.cloud.wms.manager.service.DiffLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("diffLogService")
+public class DiffLogServiceImpl extends ServiceImpl<DiffLogMapper, DiffLog> implements DiffLogService {
+
+}
diff --git a/src/main/resources/mapper/DiffLogMapper.xml b/src/main/resources/mapper/DiffLogMapper.xml
new file mode 100644
index 0000000..39cc108
--- /dev/null
+++ b/src/main/resources/mapper/DiffLogMapper.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.DiffLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="zy.cloud.wms.manager.entity.DiffLog">
+ <id column="id" property="id" />
+ <result column="matnr" property="matnr" />
+ <result column="doc_count" property="docCount" />
+ <result column="stock" property="stock" />
+ <result column="asrs_count" property="asrsCount" />
+ <result column="wms_count" property="wmsCount" />
+ <result column="diff" property="diff" />
+ <result column="create_time" property="createTime" />
+ <result column="memo" property="memo" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/diffLog/diffLog.js b/src/main/webapp/static/js/diffLog/diffLog.js
new file mode 100644
index 0000000..9d1c007
--- /dev/null
+++ b/src/main/webapp/static/js/diffLog/diffLog.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: '#diffLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/diffLog/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'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'docCount', align: 'center',title: 'erp鏁伴噺'}
+ ,{field: 'stock', align: 'center',title: 'wms鏁伴噺'}
+ ,{field: 'asrsCount', align: 'center',title: '绔嬪簱'}
+ ,{field: 'wmsCount', align: 'center',title: '骞充粨'}
+ ,{field: 'diff', align: 'center',title: '宸紓鍊�'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞浜嬩欢'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞'}
+
+ ,{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(diffLog)', 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(diffLog)', 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 = {
+ 'diffLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/diffLog/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(diffLog)', 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+"/diffLog/"+(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+"/diffLog/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: '#createTime\\$',
+ 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/diffLog/diffLog.html b/src/main/webapp/views/diffLog/diffLog.html
new file mode 100644
index 0000000..525d11e
--- /dev/null
+++ b/src/main/webapp/views/diffLog/diffLog.html
@@ -0,0 +1,118 @@
+<!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="diffLog" lay-filter="diffLog"></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/diffLog/diffLog.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 layui-form-required">鍟嗗搧缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" lay-vertype="tips" lay-verify="required">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">erp鏁伴噺: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="docCount" placeholder="璇疯緭鍏rp鏁伴噺">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">wms鏁伴噺: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="stock" placeholder="璇疯緭鍏ms鏁伴噺">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绔嬪簱: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="asrsCount" placeholder="璇疯緭鍏ョ珛搴�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">骞充粨: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wmsCount" placeholder="璇疯緭鍏ュ钩浠�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸紓鍊�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="diff" placeholder="璇疯緭鍏ュ樊寮傚��">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞浜嬩欢: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" 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