From fc857144a59bddcf895ca2d4c2b58b127128e36e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 26 十二月 2023 12:59:09 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java | 18 ++
zy-asrs-wms/src/main/webapp/views/locDetlStatis/locDetlStatis.html | 59 +++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java | 4
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java | 7
zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml | 42 +++++
zy-asrs-wms/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 256 ++++++++++++++++++++++++++++++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java | 7
zy-asrs-common/src/main/java/com/zy/asrs/common/utils/Synchro.java | 38 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 32 ++++
9 files changed, 463 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/Synchro.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/Synchro.java
new file mode 100644
index 0000000..9e64c57
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/utils/Synchro.java
@@ -0,0 +1,38 @@
+package com.zy.asrs.common.utils;
+
+import com.zy.asrs.framework.exception.CoolException;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+
+/**
+ * Created by vincent on 2022/4/1
+ */
+public class Synchro {
+
+ public static void Copy(Object source, Object dest) {
+ try {
+ BeanInfo sourceBean = Introspector.getBeanInfo(source.getClass(),Object.class);
+ PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
+ BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
+ PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
+ for (PropertyDescriptor propertyDescriptor : sourceProperty) {
+ for (PropertyDescriptor descriptor : destProperty) {
+ if (propertyDescriptor.getName().equals(descriptor.getName()) && propertyDescriptor.getPropertyType() == descriptor.getPropertyType()) {
+ Method readMethod = propertyDescriptor.getReadMethod();
+ Method writeMethod = descriptor.getWriteMethod();
+ if (null != writeMethod && null != readMethod) {
+ writeMethod.invoke(dest, readMethod.invoke(source));
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new CoolException("灞炴�у鍒跺け璐�:" + e.getMessage());
+ }
+ }
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
index 9db0c83..f302516 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.zy.asrs.common.utils.Synchro;
import com.zy.asrs.common.wms.service.LocMastService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -332,5 +333,8 @@
return null;
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java
index 079caa7..d7235f1 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/LocDetlMapper.java
@@ -1,12 +1,19 @@
package com.zy.asrs.common.wms.mapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zy.asrs.common.wms.entity.LocDetl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
+import java.util.Map;
+
@Mapper
@Repository
public interface LocDetlMapper extends BaseMapper<LocDetl> {
+ IPage<LocDetl> getStockStatis(IPage<?> page, Map<String, Object> map);
+
+ Integer sum();
+
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java
index 8f76608..d063f02 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/LocDetlService.java
@@ -1,8 +1,15 @@
package com.zy.asrs.common.wms.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.common.wms.entity.LocDetl;
+import java.util.Map;
+
public interface LocDetlService extends IService<LocDetl> {
+ IPage<LocDetl> getStockStatis(Integer curr, Integer limit, Map<String, Object> param);
+
+ Integer sum();
+
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
index 16b3861..9c48722 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/LocDetlServiceImpl.java
@@ -1,12 +1,30 @@
package com.zy.asrs.common.wms.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.mapper.LocDetlMapper;
import com.zy.asrs.common.wms.entity.LocDetl;
import com.zy.asrs.common.wms.service.LocDetlService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.Map;
+
@Service("locDetlService")
public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService {
+ @Override
+ public IPage<LocDetl> getStockStatis(Integer curr, Integer limit, Map<String, Object> param) {
+ Page<LocDetl> page = new Page<>(curr, limit);
+ return this.baseMapper.getStockStatis(page, param);
+ }
+
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @Override
+ public Integer sum() {
+ return this.baseMapper.sum();
+ }
}
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
index 85d67b3..a137f77 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/LocDetlMapper.xml
@@ -2,4 +2,46 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.LocDetlMapper">
+ <sql id="stockOutCondition">
+ <if test="map.loc_no!=null and map.loc_no!='' ">
+ and a.loc_no like '%' + #{map.loc_no} + '%'
+ </if>
+ <if test="map.matnr!=null and map.matnr!='' ">
+ and a.matnr like '%' + #{map.matnr} + '%'
+ </if>
+ <if test="map.maktx!=null and map.maktx!='' ">
+ and a.maktx like '%' + #{map.maktx} + '%'
+ </if>
+ <if test="map.batch!=null and map.batch!='' ">
+ and a.batch like '%' + #{map.batch} + '%'
+ </if>
+ <if test="map.anfme!=null and map.anfme!='' ">
+ and a.anfme like '%' + #{map.anfme} + '%'
+ </if>
+ <if test="map.startTime!=null and map.endTime!=null">
+ and a.modi_time between #{map.startTime} and #{map.endTime}
+ </if>
+ <if test="map.memo!=null and map.memo!='' and map.memo!='all'">
+ and a.memo like '%' + #{map.memo} + '%'
+ </if>
+ <if test="map.memo!=null and map.memo!='' and map.memo=='all'">
+ and a.memo is not null
+ and a.memo !=''
+ </if>
+ </sql>
+
+ <select id="getStockStatis" resultType="com.zy.asrs.common.wms.entity.LocDetl">
+ select
+ a.matnr
+ , sum(a.anfme) as anfme
+ from asr_loc_detl a
+ where 1=1
+ <include refid="stockOutCondition"></include>
+ group by a.matnr
+ </select>
+
+ <select id="sum" resultType="java.lang.Integer">
+ SELECT SUM(anfme) FROM asr_loc_detl
+ </select>
+
</mapper>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index 4d914de..7bb3f93 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -3,9 +3,12 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.LocDetl;
+import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.service.LocDetlService;
+import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -22,6 +25,8 @@
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/locDetl/{id}/auth")
@ManagerAuth
@@ -110,4 +115,31 @@
return R.ok().add(vos);
}
+ @RequestMapping(value = "/locDetl/statis/auth")
+ @ManagerAuth
+ public R statis(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param) {
+ IPage<LocDetl> stockStatis = locDetlService.getStockStatis(curr, limit, param);
+ for (LocDetl locDetl : stockStatis.getRecords()) {
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>()
+ .eq(Mat::getMatnr, locDetl.getMatnr())
+ .eq(Mat::getHostId, getHostId()));
+ if (mat != null) {
+ locDetl.sync(mat);
+ }
+ }
+ return R.ok().add(stockStatis);
+ }
+
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @RequestMapping("/locDetl/count")
+ public R getAllCount(){
+ Integer sum = locDetlService.sum();
+ return R.ok(sum);
+ }
+
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/zy-asrs-wms/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
new file mode 100644
index 0000000..fd1da33
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -0,0 +1,256 @@
+var pageCurr;
+function getCol() {
+ var cols = [
+ {field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'}
+ ];
+ arrRemove(detlCols, "field", "anfme")
+ arrRemove(detlCols, "field", "zpallet")
+ cols.push.apply(cols, detlCols);
+ // cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
+ // )
+ return cols;
+}
+
+layui.use(['table','laydate', 'form'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#locDetlStatis',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/locDetl/statis/auth',
+ page: true,
+ limit: 20,
+ limits: [20, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ 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();
+ form.on('checkbox(tableCheckbox)', function (data) {
+ var _index = $(data.elem).attr('table-index')||0;
+ if(data.elem.checked){
+ res.data[_index][data.value] = 'Y';
+ }else{
+ res.data[_index][data.value] = 'N';
+ }
+ });
+ /**
+ * 鏄剧ず搴撳瓨鎬绘暟閲�
+ */
+ $.ajax({
+ url: baseUrl+"/locDetl/count",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ $("#countNum").text(res.data + '涓�');
+ }
+ });
+
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(locDetlStatis)', 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
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(locDetlStatis)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch(obj.event) {
+ case 'exportAll':
+ layer.closeAll();
+ layer.load(1, {shade: [0.1,'#fff']});
+ location.href = baseUrl + "/locDetl/statis/export";
+ layer.closeAll('loading');
+ 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 = {
+ 'locDetl': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/locDetl/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)
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(locDetlStatis)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ // 璇︽儏
+ case 'detail':
+ layer.open({
+ type: 2,
+ title: '璇︽儏',
+ maxmin: true,
+ area: [top.detailWidth, top.detailHeight],
+ shadeClose: false,
+ content: 'locDetl_detail.html',
+ success: function(layero, index){
+ setFormVal(layer.getChildFrame('#detail', index), data, true);
+ top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true);
+ layer.getChildFrame('#data-detail-submit-save,#data-detail-submit-edit,#prompt', index).hide();
+ layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});
+ layero.find('iframe')[0].contentWindow.layui.form.render('select');
+ layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');
+ }
+ });
+ break;
+
+ }
+ });
+
+
+ // 鎼滅储鏍忔悳绱簨浠�
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 鎼滅储鏍忛噸缃簨浠�
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ layDate.render({
+ elem: '#modiTime\\$',
+ type: 'datetime'
+ });
+ layDate.render({
+ elem: '#appeTime\\$',
+ type: 'datetime'
+ });
+
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(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;
+ });
+ (child ? parent.tableIns : tableIns).reload({
+ where: searchData,
+ page: {
+ curr: pageCurr
+ },
+ done: function (res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ if (res.data.length === 0 && count !== 0) {
+ tableIns.reload({
+ where: searchData,
+ page: {
+ curr: pageCurr-1
+ }
+ });
+ pageCurr -= 1;
+ }
+ limit(child);
+ }
+ });
+}
+
+function detailScreen(index) {
+ var detail = layer.getChildFrame('#data-detail', index);
+ var height = detail.height()+60;
+ if (height > ($(window).height()*0.9)) {
+ height = ($(window).height()*0.8);
+ }
+ layer.style(index, {
+// top: (($(window).height()-height)/3)+"px",
+ height: height+'px'
+ });
+}
+
+$('body').keydown(function () {
+ if (event.keyCode === 13) {
+ $("#search").click();
+ }
+});
diff --git a/zy-asrs-wms/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/zy-asrs-wms/src/main/webapp/views/locDetlStatis/locDetlStatis.html
new file mode 100644
index 0000000..a312e9c
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -0,0 +1,59 @@
+<!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/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" style="display: inline-block">
+ <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 class="layui-inline">
+ <fieldset class="layui-elem-field">
+ <legend>鎬昏鏁伴噺</legend>
+ <div class="layui-field-box" id="countNum">
+ 璇风◢绛�
+ </div>
+ </fieldset>
+ </div>
+</div>
+
+<!-- 琛ㄦ牸 -->
+<div class="layui-form">
+ <table class="layui-hide" id="locDetlStatis" lay-filter="locDetlStatis"></table>
+</div>
+<script type="text/html" id="toolbar">
+
+ <div class="layui-btn-container layui-col-md1">
+ <button class="layui-btn" lay-event="exportAll" style="margin-top: -0px">瀵煎嚭鍏ㄩ儴</button>
+ </div>
+</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/locDetlStatis/locDetlStatis.js" charset="utf-8"></script>
+
+</body>
+</html>
+
--
Gitblit v1.9.1