From 607e14a92ba7c0b2dc277591e93104b53274d282 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 07 九月 2023 16:56:34 +0800
Subject: [PATCH] #库存预警、库存统计同步物料
---
.idea/zy-asrs.iml | 9
src/main/webapp/static/js/locDetlWarning/locDetlWarning.js | 269 ++++++++++++++++++++++++++
src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java | 27 ++
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 4
src/main/java/com/zy/asrs/service/LocDetlService.java | 4
src/main/java/com/zy/asrs/controller/LocDetlController.java | 21 ++
src/main/java/com/zy/asrs/entity/LocDetl.java | 1
src/main/resources/mapper/LocDetlMapper.xml | 154 ++++++++++++++
src/main/webapp/views/locDetlWarning/locDetlWarning.html | 59 +++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 10 +
.idea/misc.xml | 2
11 files changed, 542 insertions(+), 18 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 354c23c..5b6a5c4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -10,7 +10,7 @@
</list>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_14" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/zy-asrs.iml b/.idea/zy-asrs.iml
index 1a0fbcc..067d357 100644
--- a/.idea/zy-asrs.iml
+++ b/.idea/zy-asrs.iml
@@ -22,8 +22,6 @@
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: cn.cool:framework:2.2.0" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.14" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.1.3.RELEASE" level="project" />
@@ -48,6 +46,7 @@
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.5.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.5.RELEASE" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
@@ -70,7 +69,6 @@
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.2.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.2" level="project" />
<orderEntry type="library" name="Maven: cn.cool:framework:2.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.47" level="project" />
<orderEntry type="library" name="Maven: com.microsoft.sqlserver:mssql-jdbc:8.2.2.jre8" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:2.3.2" level="project" />
@@ -160,10 +158,5 @@
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.3.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.1.1" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
- <orderEntry type="library" name="Maven: com.sun.activation:javax.activation:1.2.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec:1.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.jacorb:jacorb-omgapi:3.7" level="project" />
- <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" />
- <orderEntry type="library" name="Maven: org.jboss.spec.javax.rmi:jboss-rmi-api_1.0_spec:1.0.6.Final" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 9d0bcc7..15fb53b 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -11,6 +11,7 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocDetlWarningDTO;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
@@ -212,6 +213,24 @@
return R.ok();
}
-
+ @RequestMapping(value = "/locDetl/selectAllWarning/auth")
+ @ManagerAuth(memo = "搴撳瓨棰勮")
+ public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ LocDetlWarningDTO locDetlWarningDTO = new LocDetlWarningDTO();
+ locDetlWarningDTO.setPageSize(limit);
+ locDetlWarningDTO.setPageNumber(curr);
+ String mat_no = String.valueOf(param.get("mat_no"));
+ if (!Cools.isEmpty(mat_no) && !mat_no.equals("null")) {
+ locDetlWarningDTO.setMat_no(mat_no);
+ }
+ List<LocDetlWarningDTO> list = locDetlService.selectAllWarning(locDetlWarningDTO);
+ int count = locDetlService.getAllWarningCount(locDetlWarningDTO);
+ Page<LocDetlWarningDTO> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index fef6b03..6f5363b 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -132,6 +132,7 @@
@ApiModelProperty(value= "绫诲埆")
private String str5;
+
public String getStr5$(){
if (Cools.isEmpty(this.str5) ){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java b/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
new file mode 100644
index 0000000..9fb48a9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/LocDetlWarningDTO.java
@@ -0,0 +1,27 @@
+package com.zy.asrs.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class LocDetlWarningDTO {
+
+ private int pageNumber;
+ private int pageSize;
+ private Integer row;
+ private String mat_name;
+ private String mat_no;
+ private String str3;
+ private Double qty;
+ private Double all_qty;
+ private String specs;
+ private String unit;
+ private String color;
+ private Double qty_box;
+ private Double weight;
+ private String str4;
+ private String str5;
+ private String num1;
+ private String str6;
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index b60ab2c..db498cc 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocDetlWarningDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -46,4 +47,7 @@
@Select("select mat_no,mat_name,sum(qty) qty from asr_loc_detl group by mat_no,mat_name")
List<LocDetl> getStockSum();
+ List<LocDetlWarningDTO> selectAllWarning(LocDetlWarningDTO locDetlWarningDTO);
+
+ int getAllWarningCount(LocDetlWarningDTO locDetlWarningDTO);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index d6bf0d2..05f4ebc 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocDetlWarningDTO;
import java.util.List;
@@ -66,4 +67,7 @@
*/
public List<LocDetl> getStockSum();
+ List<LocDetlWarningDTO> selectAllWarning(LocDetlWarningDTO locDetlWarningDTO);
+
+ int getAllWarningCount(LocDetlWarningDTO locDetlWarningDTO);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index e5dfa72..ea9ff0f 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocDetlWarningDTO;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
@@ -85,4 +86,13 @@
return locDetlMapper.getStockSum();
}
+ @Override
+ public List<LocDetlWarningDTO> selectAllWarning(LocDetlWarningDTO locDetlWarningDTO) {
+ return this.baseMapper.selectAllWarning(locDetlWarningDTO);
+ }
+
+ @Override
+ public int getAllWarningCount(LocDetlWarningDTO locDetlWarningDTO) {
+ return this.baseMapper.getAllWarningCount(locDetlWarningDTO);
+ }
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index a318c91..051b5e6 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -197,18 +197,19 @@
where loc_no=#{locNo}
</select>
<select id="getStockStatis" resultMap="BaseResultMap">
- select * from
+ select * ,str6 as qty_box,(qty * str6) as all_qty from
(
select ROW_NUMBER() over (order by a.mat_no) as row,
- a.mat_name,a.mat_no,a.str3,sum(a.qty) qty,sum(all_qty) all_qty, specs,unit,color,qty_box,weight,str4,str5 from
+ a.mat_name,a.mat_no,a.str3,sum(a.qty) qty, specs,unit,color,weight,str4,str5,num1,str6 from
(
select
- mat_name,mat_no,str3,qty,all_qty,specs,unit,color,qty_box,weight,str4,str5
+ c.mat_name,c.mat_no,c.str3,c.qty,c.all_qty,c.specs,c.unit,c.color,c.weight,c.str4,c.str5,m.num1,m.str6
from asr_loc_detl c
+ LEFT JOIN bas_mat_code m ON c.mat_no = m.mat_no
where 1=1
<include refid="stockOutCondition1"></include>
) a
- group by a.mat_no,a.mat_name,a.str3,a.specs,a.unit,a.color,a.qty_box,a.weight,a.str4,a.str5
+ group by a.mat_no,a.mat_name,a.str3,a.specs,a.unit,a.color,a.weight,a.str4,a.str5,num1,str6
) d
where 1=1
and row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
@@ -234,15 +235,16 @@
select count(1) from
(
select ROW_NUMBER() over (order by a.mat_no) as row,
- a.mat_name,a.mat_no,a.str3,sum(a.qty) qty,specs,unit,color,qty_box,weight,str4,str5 from
+ a.mat_name,a.mat_no,a.str3,sum(a.qty) qty, specs,unit,color,qty_box,weight,str4,str5,num1,str6 from
(
select
- mat_name,mat_no,str3,qty,specs,unit,color,qty_box,weight,str4,str5
+ c.mat_name,c.mat_no,c.str3,c.qty,c.all_qty,c.specs,c.unit,c.color,c.qty_box,c.weight,c.str4,c.str5,m.num1,m.str6
from asr_loc_detl c
+ LEFT JOIN bas_mat_code m ON c.mat_no = m.mat_no
where 1=1
<include refid="stockOutCondition1"></include>
) a
- group by a.mat_no,a.mat_name,a.str3,a.specs,a.unit,a.color,a.qty_box,a.weight,a.str4,a.str5
+ group by a.mat_no,a.mat_name,a.str3,a.specs,a.unit,a.color,a.qty_box,a.weight,a.str4,a.str5,num1,str6
) d
<!-- select count(1) from-->
<!-- (-->
@@ -270,7 +272,143 @@
group by a.mat_no,a.mat_name,a.supplier,a.str3,a.specs,a.unit,a.color,a.qty_box,a.weight,a.str4,a.str5
</select>
-<!-- <select id="getStockSum" resultMap="BaseResultMap">-->
+ <sql id="selectAllWarningSql">
+ <if test="mat_name != null and mat_name != '' ">
+ and c.mat_name like '%' + #{mat_name} + '%'
+ </if>
+ <if test="mat_no != null and mat_no !='' ">
+ and c.mat_no like '%' + #{mat_no} + '%'
+ </if>
+
+ </sql>
+ <select id="selectAllWarning" resultType="com.zy.asrs.entity.LocDetlWarningDTO">
+ SELECT
+ *,(qty * str6) as all_qty
+ FROM
+ (
+ SELECT
+ ROW_NUMBER ( ) OVER ( ORDER BY a.mat_no ) AS row,
+ a.mat_name,
+ a.mat_no,
+ a.str3,
+ SUM ( a.qty ) qty,
+ specs,
+ unit,
+ color,
+ qty_box,
+ weight,
+ str4,
+ str5,
+ num1,
+ str6
+ FROM
+ (
+ SELECT
+ c.mat_name,
+ c.mat_no,
+ c.str3,
+ c.qty,
+ c.all_qty,
+ c.specs,
+ c.unit,
+ c.color,
+ c.qty_box,
+ c.weight,
+ c.str4,
+ c.str5,
+ m.num1,
+ str6
+ FROM
+ asr_loc_detl c
+ LEFT JOIN bas_mat_code m ON c.mat_no = m.mat_no
+ WHERE
+ 1 = 1
+ <include refid="selectAllWarningSql"></include>
+ ) a
+ GROUP BY
+ a.mat_no,
+ a.mat_name,
+ a.str3,
+ a.specs,
+ a.unit,
+ a.color,
+ a.qty_box,
+ a.weight,
+ a.str4,
+ a.str5,
+ a.num1,
+ str6
+ ) d
+ WHERE
+ 1 = 1
+ AND qty <= num1
+ AND d.row BETWEEN ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+ </select>
+
+ <select id="getAllWarningCount" resultType="java.lang.Integer">
+ SELECT
+ COUNT(1)
+ FROM
+ (
+ SELECT
+ ROW_NUMBER ( ) OVER ( ORDER BY a.mat_no ) AS row,
+ a.mat_name,
+ a.mat_no,
+ a.str3,
+ SUM ( a.qty ) qty,
+ SUM ( all_qty ) all_qty,
+ specs,
+ unit,
+ color,
+ qty_box,
+ weight,
+ str4,
+ str5,
+ num1
+ FROM
+ (
+ SELECT
+ c.mat_name,
+ c.mat_no,
+ c.str3,
+ c.qty,
+ c.all_qty,
+ c.specs,
+ c.unit,
+ c.color,
+ c.qty_box,
+ c.weight,
+ c.str4,
+ c.str5,
+ m.num1
+ FROM
+ asr_loc_detl c
+ LEFT JOIN bas_mat_code m ON c.mat_no = m.mat_no
+ WHERE
+ 1 = 1
+ <include refid="selectAllWarningSql"></include>
+ ) a
+ GROUP BY
+ a.mat_no,
+ a.mat_name,
+ a.str3,
+ a.specs,
+ a.unit,
+ a.color,
+ a.qty_box,
+ a.weight,
+ a.str4,
+ a.str5,
+ a.num1
+ ) d
+ WHERE
+ 1 = 1
+ AND qty <= num1
+ </select>
+
+
+
+ <!-- <select id="getStockSum" resultMap="BaseResultMap">-->
<!-- select mat_no,mat_name,sum(qty) qty from asr_loc_detl-->
<!-- group by mat_no,mat_name-->
<!-- </select>-->
diff --git a/src/main/webapp/static/js/locDetlWarning/locDetlWarning.js b/src/main/webapp/static/js/locDetlWarning/locDetlWarning.js
new file mode 100644
index 0000000..6f91871
--- /dev/null
+++ b/src/main/webapp/static/js/locDetlWarning/locDetlWarning.js
@@ -0,0 +1,269 @@
+var pageCurr;
+function getCol() {
+ var cols = [
+ {field: 'countAnfme', 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: '#locDetlWarning',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/locDetl/selectAllWarning/auth',
+ page: true,
+ limit: 20,
+ limits: [20, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [[
+ {field: 'qty', align: 'center', title: '鍦ㄥ簱绠辨暟', width: 120}
+ ,{field: 'num1', align: 'center', title: '瀹夊叏绠辨暟', width: 120}
+ , {field: 'mat_no', align: 'center', title: '浜у搧缂栫爜'}
+ , {field: 'mat_name', align: 'center', title: '浜у搧鍚嶇О'}
+ , {field: 'specs', align: 'center',title: '瑙勬牸'}
+ , {field: 'unit', align: 'center',title: '鍗曚綅', width:80}
+ , {field: 'color', align: 'center',title: '棰滆壊'}
+ , {field: 'str6', align: 'center',title: '姣忕鏁伴噺(PCS)'}
+ , {field: 'all_qty', align: 'center',title: '鎬绘暟閲�(PCS)'}
+ , {field: 'weight', align: 'center',title: '姣忕閲嶉噺(KG)'}
+
+ ]
+ ],
+ 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/src/main/webapp/views/locDetlWarning/locDetlWarning.html b/src/main/webapp/views/locDetlWarning/locDetlWarning.html
new file mode 100644
index 0000000..718b2ef
--- /dev/null
+++ b/src/main/webapp/views/locDetlWarning/locDetlWarning.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="mat_no" 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="locDetlWarning" lay-filter="locDetlWarning"></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/locDetlWarning/locDetlWarning.js" charset="utf-8"></script>
+
+</body>
+</html>
+
--
Gitblit v1.9.1