From 0a060d5b56ae812711ae0e3def576263f71fcb3c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 23 十一月 2021 16:05:30 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/DiffValMapper.xml | 16 +
src/main/java/zy/cloud/wms/manager/service/DiffValService.java | 8
src/main/java/zy/cloud/wms/manager/controller/DiffValController.java | 123 ++++++++++
src/main/java/diffVal.sql | 20 +
src/main/java/zy/cloud/wms/common/service/task/DiffValScheduler.java | 28 ++
src/main/webapp/views/diffVal/diffVal.html | 106 ++++++++
src/main/java/zy/cloud/wms/manager/entity/DiffVal.java | 141 +++++++++++
src/main/java/zy/cloud/wms/common/CodeBuilder.java | 2
src/main/webapp/static/js/diffVal/diffVal.js | 248 ++++++++++++++++++++
src/main/java/zy/cloud/wms/manager/mapper/DiffValMapper.java | 12 +
src/main/java/zy/cloud/wms/manager/service/impl/DiffValServiceImpl.java | 12 +
11 files changed, 715 insertions(+), 1 deletions(-)
diff --git a/src/main/java/diffVal.sql b/src/main/java/diffVal.sql
new file mode 100644
index 0000000..9c33de3
--- /dev/null
+++ b/src/main/java/diffVal.sql
@@ -0,0 +1,20 @@
+-- save diffVal record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'diffVal/diffVal.html', 'diffVal绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'diffVal#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'diffVal#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'diffVal#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'diffVal#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'diffVal#btn-export', '瀵煎嚭', '', '3', '4', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'diffVal#btn-into', '瀵煎叆', '', '3', '5', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'diffVal/diffVal.html', N'diffVal绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'diffVal#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'diffVal#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'diffVal#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'diffVal#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'diffVal#btn-export', N'瀵煎嚭', '', '3', '4', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'diffVal#btn-into', N'瀵煎叆', '', '3', '5', '1');
diff --git a/src/main/java/zy/cloud/wms/common/CodeBuilder.java b/src/main/java/zy/cloud/wms/common/CodeBuilder.java
index a956c07..5487d99 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_diff_log";
+ generator.table="man_diff_val";
generator.packagePath="zy.cloud.wms.manager";
// generator.js = false;
// generator.html = false;
diff --git a/src/main/java/zy/cloud/wms/common/service/task/DiffValScheduler.java b/src/main/java/zy/cloud/wms/common/service/task/DiffValScheduler.java
new file mode 100644
index 0000000..839fafe
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/common/service/task/DiffValScheduler.java
@@ -0,0 +1,28 @@
+package zy.cloud.wms.common.service.task;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RestController;
+import zy.cloud.wms.manager.service.DiffValService;
+
+/**
+ * Created by vincent on 2021/11/23
+ */
+@Slf4j
+@Component
+public class DiffValScheduler {
+
+ @Autowired
+ private DiffValService diffValService;
+
+ @Transactional
+ @Scheduled(cron = "0/10 * * * * ? ")
+ public void run() {
+
+
+ }
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java b/src/main/java/zy/cloud/wms/manager/controller/DiffValController.java
new file mode 100644
index 0000000..f2b6e68
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/controller/DiffValController.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.DiffVal;
+import zy.cloud.wms.manager.service.DiffValService;
+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 DiffValController extends BaseController {
+
+ @Autowired
+ private DiffValService diffValService;
+
+ @RequestMapping(value = "/diffVal/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(diffValService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/diffVal/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<DiffVal> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(diffValService.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 = "/diffVal/add/auth")
+ @ManagerAuth
+ public R add(DiffVal diffVal) {
+ diffValService.insert(diffVal);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/diffVal/update/auth")
+ @ManagerAuth
+ public R update(DiffVal diffVal){
+ if (Cools.isEmpty(diffVal) || null==diffVal.getMatnr()){
+ return R.error();
+ }
+ diffValService.updateById(diffVal);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/diffVal/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ diffValService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/diffVal/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<DiffVal> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("diffVal"));
+ convert(map, wrapper);
+ List<DiffVal> list = diffValService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/diffValQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<DiffVal> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<DiffVal> page = diffValService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (DiffVal diffVal : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", diffVal.getMatnr());
+ map.put("value", diffVal.getMatnr());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/diffVal/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<DiffVal> wrapper = new EntityWrapper<DiffVal>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != diffValService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(DiffVal.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/DiffVal.java b/src/main/java/zy/cloud/wms/manager/entity/DiffVal.java
new file mode 100644
index 0000000..9b40b6f
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/entity/DiffVal.java
@@ -0,0 +1,141 @@
+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 com.baomidou.mybatisplus.annotations.TableField;
+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("man_diff_val")
+public class DiffVal implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鐗╂枡缂栧彿
+ */
+ @ApiModelProperty(value= "鐗╂枡缂栧彿")
+ @TableId(value = "matnr", type = IdType.INPUT)
+ private String matnr;
+
+ /**
+ * WMS搴撳瓨
+ */
+ @ApiModelProperty(value= "WMS搴撳瓨")
+ @TableField("stock_qty")
+ private Double stockQty;
+
+ /**
+ * ERP搴撳瓨
+ */
+ @ApiModelProperty(value= "ERP搴撳瓨")
+ @TableField("erp_qty")
+ private Double erpQty;
+
+ /**
+ * 宸紓鍊�
+ */
+ @ApiModelProperty(value= "宸紓鍊�")
+ private Double val;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @ApiModelProperty(value= "鏇存柊鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public DiffVal() {}
+
+ public DiffVal(String matnr,Double stockQty,Double erpQty,Double val,Date updateTime,String memo) {
+ this.matnr = matnr;
+ this.stockQty = stockQty;
+ this.erpQty = erpQty;
+ this.val = val;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// DiffVal diffVal = new DiffVal(
+// null, // 鐗╂枡缂栧彿[闈炵┖]
+// null, // WMS搴撳瓨
+// null, // ERP搴撳瓨
+// null, // 宸紓鍊�
+// null, // 鏇存柊鏃堕棿
+// null // 澶囨敞
+// );
+
+ public String getMatnr() {
+ return matnr;
+ }
+
+ public void setMatnr(String matnr) {
+ this.matnr = matnr;
+ }
+
+ public Double getStockQty() {
+ return stockQty;
+ }
+
+ public void setStockQty(Double stockQty) {
+ this.stockQty = stockQty;
+ }
+
+ public Double getErpQty() {
+ return erpQty;
+ }
+
+ public void setErpQty(Double erpQty) {
+ this.erpQty = erpQty;
+ }
+
+ public Double getVal() {
+ return val;
+ }
+
+ public void setVal(Double val) {
+ this.val = val;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/DiffValMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/DiffValMapper.java
new file mode 100644
index 0000000..618c983
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/mapper/DiffValMapper.java
@@ -0,0 +1,12 @@
+package zy.cloud.wms.manager.mapper;
+
+import zy.cloud.wms.manager.entity.DiffVal;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface DiffValMapper extends BaseMapper<DiffVal> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/DiffValService.java b/src/main/java/zy/cloud/wms/manager/service/DiffValService.java
new file mode 100644
index 0000000..8283753
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/DiffValService.java
@@ -0,0 +1,8 @@
+package zy.cloud.wms.manager.service;
+
+import zy.cloud.wms.manager.entity.DiffVal;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface DiffValService extends IService<DiffVal> {
+
+}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/DiffValServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/DiffValServiceImpl.java
new file mode 100644
index 0000000..7f2bd66
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/DiffValServiceImpl.java
@@ -0,0 +1,12 @@
+package zy.cloud.wms.manager.service.impl;
+
+import zy.cloud.wms.manager.mapper.DiffValMapper;
+import zy.cloud.wms.manager.entity.DiffVal;
+import zy.cloud.wms.manager.service.DiffValService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("diffValService")
+public class DiffValServiceImpl extends ServiceImpl<DiffValMapper, DiffVal> implements DiffValService {
+
+}
diff --git a/src/main/resources/mapper/DiffValMapper.xml b/src/main/resources/mapper/DiffValMapper.xml
new file mode 100644
index 0000000..486a675
--- /dev/null
+++ b/src/main/resources/mapper/DiffValMapper.xml
@@ -0,0 +1,16 @@
+<?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.DiffValMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="zy.cloud.wms.manager.entity.DiffVal">
+ <result column="matnr" property="matnr" />
+ <result column="stock_qty" property="stockQty" />
+ <result column="erp_qty" property="erpQty" />
+ <result column="val" property="val" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/webapp/static/js/diffVal/diffVal.js b/src/main/webapp/static/js/diffVal/diffVal.js
new file mode 100644
index 0000000..263d248
--- /dev/null
+++ b/src/main/webapp/static/js/diffVal/diffVal.js
@@ -0,0 +1,248 @@
+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: '#diffVal',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/diffVal/list/auth',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡缂栧彿'}
+ ,{field: 'stockQty', align: 'center',title: 'WMS搴撳瓨'}
+ ,{field: 'erpQty', align: 'center',title: 'ERP搴撳瓨'}
+ ,{field: 'val', align: 'center',title: '宸紓鍊�', style: 'font-weight: bold;color: blue'}
+ ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿', hide: true}
+ ,{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(diffVal)', 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(diffVal)', 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.matnr;
+ });
+ 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 = {
+ 'diffVal': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/diffVal/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(diffVal)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ var ids = [data.matnr];
+ 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+"/diffVal/"+(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+"/diffVal/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: '#updateTime\\$',
+ 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/diffVal/diffVal.html b/src/main/webapp/views/diffVal/diffVal.html
new file mode 100644
index 0000000..146d35a
--- /dev/null
+++ b/src/main/webapp/views/diffVal/diffVal.html
@@ -0,0 +1,106 @@
+<!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="matnr" 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="diffVal" lay-filter="diffVal"></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" style="margin-top: 10px">瀵煎嚭</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/diffVal/diffVal.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">WMS搴撳瓨: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="stockQty" placeholder="璇疯緭鍏MS搴撳瓨">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">ERP搴撳瓨: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="erpQty" placeholder="璇疯緭鍏RP搴撳瓨">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸紓鍊�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="val" placeholder="璇疯緭鍏ュ樊寮傚��">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏇存柊鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" 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