From f3914234db3bf68dad372c4dfb9a1111a0c09e32 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 28 十二月 2023 15:04:22 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pla/productionInfo.js | 196 ++------
src/main/webapp/views/pla/productionInfo.html | 10
src/main/webapp/views/pla/waitingPakin.html | 114 +++++
src/main/java/com/zy/asrs/controller/PlaController.java | 73 +++
src/main/webapp/static/js/pla/qualityInfo.js | 173 ++++++++
src/main/java/com/zy/asrs/entity/Pla.java | 15
src/main/webapp/views/pla/qualityInfo.html | 114 +++++
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 12
src/main/java/com/zy/asrs/service/PlaService.java | 8
src/main/webapp/views/pla/plaDetl.html | 115 +++++
src/main/webapp/static/js/pla/plaDetl.js | 185 ++++++++
src/main/java/com/zy/asrs/mapper/PlaMapper.java | 12
src/main/webapp/static/js/pla/waitingPakin.js | 177 ++++++++
13 files changed, 1,064 insertions(+), 140 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
new file mode 100644
index 0000000..db9776e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -0,0 +1,73 @@
+package com.zy.asrs.controller;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.DateUtils;
+import com.core.common.R;
+import com.zy.asrs.entity.Pla;
+import com.zy.asrs.service.PlaService;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class PlaController extends BaseController {
+
+ @Autowired
+ private PlaService plaService;
+
+ @RequestMapping(value = "/pla/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ excludeTrash(param);
+ EntityWrapper<Pla> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ allLike(Pla.class, param.keySet(), wrapper, condition);
+ return R.ok(plaService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ @RequestMapping(value = "/pla/add/auth")
+ @ManagerAuth
+ public R add(@RequestBody List<Pla> plas) {
+ System.out.println(plas.toString());
+ plas.forEach(pla -> {
+ plaService.insert(pla);
+ });
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pla/update/auth")
+ @ManagerAuth
+ public R update(@RequestBody List<Pla> plas) {
+ System.out.println(plas.toString());
+ plas.forEach(pla -> {
+ plaService.updateById(pla);
+ });
+ return R.ok();
+ }
+
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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);
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/Pla.java b/src/main/java/com/zy/asrs/entity/Pla.java
index a23acfc..9e3c488 100644
--- a/src/main/java/com/zy/asrs/entity/Pla.java
+++ b/src/main/java/com/zy/asrs/entity/Pla.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -16,7 +17,8 @@
private Long id;
//鍏ュ簱鏃堕棿
- private Date io_time;
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private String pakinTime;
//鎵瑰彿
private String batch;
@@ -95,4 +97,15 @@
//鐘舵��
private String status;
+
+ //姝ラ
+ private int step;
+
+ private Date createTime;
+
+ private Date modifyTime;
+
+ private String createUser;
+
+ private String modifyUser;
}
diff --git a/src/main/java/com/zy/asrs/mapper/PlaMapper.java b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
new file mode 100644
index 0000000..2172c72
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.Pla;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface PlaMapper extends BaseMapper<Pla> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/PlaService.java b/src/main/java/com/zy/asrs/service/PlaService.java
new file mode 100644
index 0000000..7056a17
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/PlaService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.Pla;
+
+public interface PlaService extends IService<Pla> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
new file mode 100644
index 0000000..84df296
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.Pla;
+import com.zy.asrs.mapper.PlaMapper;
+import com.zy.asrs.service.PlaService;
+import org.springframework.stereotype.Service;
+
+@Service("plaService")
+public class PlaServiceImpl extends ServiceImpl<PlaMapper, Pla> implements PlaService {
+
+}
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
new file mode 100644
index 0000000..fc9080d
--- /dev/null
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -0,0 +1,185 @@
+var initCountVal = 0;
+var initAnfmeVal = "-";
+var matCodeData = [];
+var currLocNo;
+var matCodeLayerIdx;
+var data = [];
+var checkStatus = [];
+function getCol() {
+ var cols = [
+ {field: 'id', title: 'id', align: 'center',hide:true}
+ ,{type: 'checkbox'}
+ ,{field: 'pakinTime', title: '鍏ュ簱鏃堕棿', align: 'center'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'packageNo', align: 'center',title: '鍖呭彿'}
+ ,{field: 'brand', align: 'center',title: '鐗屽彿'}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺锛圞G锛�', hide:true}
+ ,{field: 'workshop', align: 'center',title: '鐢熶骇杞﹂棿', hide:true}
+ ,{field: 'line', align: 'center',title: '鐢熶骇绾�', hide:true}
+ ,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷', hide:true}
+ ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷', hide:true}
+ ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛坓/10min锛�'}
+ ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛堚剝锛�'}
+ ,{field: 'vadf1', align: 'center',title: '鎸ュ彂浠�1锛�%锛�', hide:true}
+ ,{field: 'vadf2', align: 'center',title: '鎸ュ彂浠�2锛�%锛�', hide:true}
+ ,{field: 'yellowness', align: 'center',title: '榛勫害', hide:true}
+ ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紙0-100%锛�', hide:true}
+ ,{field: 'water', align: 'center',title: '姘村垎锛坧pm锛�', hide:true}
+ ,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��', hide:true}
+ ,{field: 'problem', align: 'center',title: '璐ㄩ噺闂', hide:true}
+ ,{field: 'stash', align: 'center',title: '浠撳簱', edit:true}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅', edit:true}
+ ,{field: 'weightAnfme', align: 'center',title: '鍓╀綑閲嶉噺锛圞G锛�', edit:true}
+ ,{field: 'status', align: 'center',title: '鐘舵��', edit:true}
+ ,{field: 'createUser', align: 'center',title: '鍗曞彿', edit:true}
+ ,{field: 'createUser', align: 'center',title: '鍑哄簱鏃堕棿', edit:true}
+ ,{field: 'createUser', align: 'center',title: '閲嶉噺', edit:true}
+ ,{field: 'createUser', align: 'center',title: '缁忓姙浜�', edit:true}
+ ,{field: 'createUser', align: 'center',title: '娴佽浆褰㈠紡', edit:true}
+ ,{field: 'createUser', align: 'center',title: '瀹㈡埛鍚嶇О', edit:true}
+ ,{field: 'createUser', align: 'center',title: '璋冩嫧鍒�', edit:true}
+ ,{field: 'createUser', align: 'center',title: '澶囨敞', edit:true}
+ ];
+ return cols;
+}
+
+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: '#plaDetl',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/pla/list/auth?step=3',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ console.log(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+"/";
+ }
+ tableData = table.cache.locDetl;
+ console.log(tableData);
+ 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';
+ }
+ });
+ }
+ });
+
+
+ // 閲嶇疆浜嬩欢
+ form.on('submit(reset)', function (data) {
+ reset();
+ });
+
+ function reset() {
+ clearFormVal($('#search-box'));
+ matCodeData = [];
+ tableReload();
+ locTips(false);
+ }
+
+ // 閲嶈浇琛ㄦ牸
+ function tableReload() {
+ tableIns.reload({data: matCodeData});
+ }
+
+
+
+ $(document).on('click','#add', function () {
+ var now = dateToStr(new Date())
+ var newRow = {ioTime : now};
+ data = table.cache.plaDetl;
+ data.push(newRow);
+ table.reload('plaDetl',{
+ data: data
+ })
+ })
+
+ $(document).on('click','#delete', function () {
+ let dataNew = [];
+ let data = table.cache.plaDetl;
+ for(var i=0; i<data.length; i++){
+ if(!data[i].LAY_CHECKED){
+ dataNew.push(data[i]);
+ }
+ }
+ table.reload('plaDetl',{
+ data: dataNew
+ })
+ })
+
+ $(document).on('click','#submit', function () {
+ let data = table.cache.plaDetl;
+ let dataSave = [];
+ let dataOld = [];
+ for(var i=0; i<data.length; i++){
+ if(data[i].LAY_CHECKED){
+ if(!data[i].batch){
+ layer.msg("鏈夋湭濉啓瀛楁");
+ return;
+ }
+ data[i].step = 3;
+ dataSave.push(data[i]);
+ }else {
+ dataOld.push(data[i]);
+ }
+ }
+ $.ajax({
+ url: baseUrl+"/pla/update/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(dataSave),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg("鎻愪氦鎴愬姛");
+ table.reload('plaDetl',{
+ data: dataOld
+ })
+ } else if (res.code === 403){
+
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ })
+
+})
+
diff --git a/src/main/webapp/static/js/pla/productionInfo.js b/src/main/webapp/static/js/pla/productionInfo.js
index 8143808..0cd7b86 100644
--- a/src/main/webapp/static/js/pla/productionInfo.js
+++ b/src/main/webapp/static/js/pla/productionInfo.js
@@ -4,11 +4,12 @@
var currLocNo;
var matCodeLayerIdx;
var data = [];
+var checkStatus = [];
function getCol() {
var cols = [
{field: 'id', title: 'id', align: 'center',hide:true}
,{type: 'checkbox'}
- ,{field: 'ioTime', title: '鍏ュ簱鏃堕棿', align: 'center'}
+ ,{field: 'pakinTime', title: '鍏ュ簱鏃堕棿', align: 'center'}
,{field: 'batch', align: 'center',title: '鎵瑰彿', edit: true}
,{field: 'packageNo', align: 'center',title: '鍖呭彿', edit: true}
,{field: 'brand', align: 'center',title: '鐗屽彿', edit: true}
@@ -44,118 +45,11 @@
}
});
- // 椤甸潰淇敼
- table.on('edit(chooseData)', function (obj) {
- let index = obj.tr.attr("data-index");
- let data = matCodeData[index];
- let modify = true;
- if (obj.field === 'count'){
- let vle = Number(obj.value);
- if (isNaN(vle)) {
- layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
- modify = false;
- } else {
- if (vle <= 0) {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
- modify = false;
- }
- }
- }
- if (modify) {
- data[obj.field] = obj.value;
- }
- tableIns.reload({data: matCodeData});
- });
-
- // 鐩戝惉澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(chooseData)', function (obj) {
- switch(obj.event) {
- case 'adjust':
- if (isEmpty(currLocNo)) {
- layer.msg("璇峰厛妫�绱㈠簱浣�", {icon: 2})
- inputTip($("#searchLocNo"));
- return;
- }
- if (matCodeData.length === 0) {
- layer.msg("璇峰厛娣诲姞鏄庣粏", {icon: 2});
- return;
- }
- for (var i=0;i<matCodeData.length;i++){
- if (isNaN(matCodeData[i].count)) {
- layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
- return;
- }
- if (matCodeData[i].count < 0){
- layer.msg("鏁伴噺涓嶈兘灏忎簬闆�", {icon: 2});
- return;
- }
- }
- layer.confirm('纭畾璋冩暣'+currLocNo+'搴撲綅鐨勬槑缁嗗悧锛�', {shadeClose: true}, function(){
- $.ajax({
- url: baseUrl+"/manLocDetl/adjust/start",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- locNo: currLocNo,
- list: matCodeData
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200){
- layer.msg(currLocNo + res.msg, {icon: 1});
- init(currLocNo)
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- }else {
- layer.msg(res.msg, {icon: 2})
- }
- }
- })
- });
- break;
- }
- });
-
- // 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(chooseData)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- case 'remove':
- let index = obj.tr.attr("data-index");
- matCodeData.splice(index, 1);
- tableIns.reload({data: matCodeData});
- break;
- }
- });
-
- // 妫�绱簨浠�
- form.on('submit(search)', function (data) {
- let loc_no = data.field.loc_no;
- if (loc_no === "") {
- inputTip($("#searchLocNo"));
- layer.msg("璇疯緭鍏ュ簱浣嶅彿");
- return;
- }
- init(loc_no);
- });
// 閲嶇疆浜嬩欢
form.on('submit(reset)', function (data) {
reset();
});
-
- function init(locNo) {
- http.post(baseUrl + "/manLocDetl/list", {loc_no: locNo,limit: 1000}, function (res) {
- matCodeData = [];
- matCodeData = res.data.records;
- for (var i = 0; i<matCodeData.length; i++) {
- matCodeData[i]["count"] = matCodeData[i]["anfme"];
- }
- locTips(true, locNo);
- tableReload();
- })
- }
function reset() {
clearFormVal($('#search-box'));
@@ -169,44 +63,68 @@
tableIns.reload({data: matCodeData});
}
- // 搴撲綅鎻愮ず妗�
- function locTips(retrieve, locNo) {
- if (retrieve) {
- http.post(baseUrl+"/node/select/"+locNo+"/auth", null, function (res) {
- console.log(res);
- let data = res.data;
- if (data != null) {
- $(".retrieve").show();
- // $("#locMsg").html(locNo + " ,搴撲綅鐘舵�侊細" + data.locSts$);
- $("#locMsg").html(locNo + " ");
- $('.not-retrieve').hide();
- currLocNo = locNo;
- } else {
- layer.msg("璇疯緭鍏ユ湁鏁堝簱浣嶅彿", {icon: 2});
- $('.not-retrieve').show();
- $("#locMsg").html("");
- $(".retrieve").hide();
- currLocNo = null;
- inputTip($("#searchLocNo"));
- }
- })
- } else {
- $('.not-retrieve').show();
- $("#locMsg").html("");
- $(".retrieve").hide();
- currLocNo = null;
- }
- }
+
$(document).on('click','#add', function () {
- var strTime = "20"
- var now = new Date(year,month,date,hrs,min,sec);
- var newRow = {ioTime : now};
+ var now = dateToStr(new Date())
+ var newRow = {pakinTime : now};
+ data = table.cache.productionInfoTable;
data.push(newRow);
table.reload('productionInfoTable',{
data: data
})
})
+ $(document).on('click','#delete', function () {
+ let dataNew = [];
+ let data = table.cache.productionInfoTable;
+ for(var i=0; i<data.length; i++){
+ if(!data[i].LAY_CHECKED){
+ dataNew.push(data[i]);
+ }
+ }
+ table.reload('productionInfoTable',{
+ data: dataNew
+ })
+ })
+
+ $(document).on('click','#submit', function () {
+ let data = table.cache.productionInfoTable;
+ let dataSave = [];
+ let dataOld = [];
+ for(var i=0; i<data.length; i++){
+ if(data[i].LAY_CHECKED){
+ if(!data[i].batch){
+ layer.msg("鏈夋湭濉啓瀛楁");
+ return;
+ }
+ data[i].step = 1;
+ dataSave.push(data[i]);
+ }else {
+ dataOld.push(data[i]);
+ }
+ }
+ $.ajax({
+ url: baseUrl+"/pla/add/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(dataSave),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg("鎻愪氦鎴愬姛");
+ table.reload('productionInfoTable',{
+ data: dataOld
+ })
+ } else if (res.code === 403){
+
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ })
+
})
diff --git a/src/main/webapp/static/js/pla/qualityInfo.js b/src/main/webapp/static/js/pla/qualityInfo.js
new file mode 100644
index 0000000..d79d1a2
--- /dev/null
+++ b/src/main/webapp/static/js/pla/qualityInfo.js
@@ -0,0 +1,173 @@
+var initCountVal = 0;
+var initAnfmeVal = "-";
+var matCodeData = [];
+var currLocNo;
+var matCodeLayerIdx;
+var data = [];
+var checkStatus = [];
+function getCol() {
+ var cols = [
+ {field: 'id', title: 'id', align: 'center',hide:true}
+ ,{type: 'checkbox'}
+ ,{field: 'pakinTime', title: '鍏ュ簱鏃堕棿', align: 'center'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'packageNo', align: 'center',title: '鍖呭彿'}
+ ,{field: 'brand', align: 'center',title: '鐗屽彿'}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺锛圞G锛�', hide:true}
+ ,{field: 'workshop', align: 'center',title: '鐢熶骇杞﹂棿', hide:true}
+ ,{field: 'line', align: 'center',title: '鐢熶骇绾�', hide:true}
+ ,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷', hide:true}
+ ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷', hide:true}
+ ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛坓/10min锛�', edit: true}
+ ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛堚剝锛�', edit: true}
+ ,{field: 'vadf1', align: 'center',title: '鎸ュ彂浠�1锛�%锛�', edit: true}
+ ,{field: 'vadf2', align: 'center',title: '鎸ュ彂浠�2锛�%锛�', edit: true}
+ ,{field: 'yellowness', align: 'center',title: '榛勫害', edit: true}
+ ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紙0-100%锛�', edit: true}
+ ,{field: 'water', align: 'center',title: '姘村垎锛坧pm锛�', edit: true}
+ ,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��', edit: true}
+ ,{field: 'problem', align: 'center',title: '璐ㄩ噺闂', edit: true}
+ ];
+ return cols;
+}
+
+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: '#qualityInfoTable',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/pla/list/auth?step=1',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ console.log(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+"/";
+ }
+ tableData = table.cache.locDetl;
+ console.log(tableData);
+ 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';
+ }
+ });
+ }
+ });
+
+
+ // 閲嶇疆浜嬩欢
+ form.on('submit(reset)', function (data) {
+ reset();
+ });
+
+ function reset() {
+ clearFormVal($('#search-box'));
+ matCodeData = [];
+ tableReload();
+ locTips(false);
+ }
+
+ // 閲嶈浇琛ㄦ牸
+ function tableReload() {
+ tableIns.reload({data: matCodeData});
+ }
+
+
+
+ $(document).on('click','#add', function () {
+ var now = dateToStr(new Date())
+ var newRow = {ioTime : now};
+ data = table.cache.qualityInfoTable;
+ data.push(newRow);
+ table.reload('qualityInfoTable',{
+ data: data
+ })
+ })
+
+ $(document).on('click','#delete', function () {
+ let dataNew = [];
+ let data = table.cache.qualityInfoTable;
+ for(var i=0; i<data.length; i++){
+ if(!data[i].LAY_CHECKED){
+ dataNew.push(data[i]);
+ }
+ }
+ table.reload('qualityInfoTable',{
+ data: dataNew
+ })
+ })
+
+ $(document).on('click','#submit', function () {
+ let data = table.cache.qualityInfoTable;
+ let dataSave = [];
+ let dataOld = [];
+ for(var i=0; i<data.length; i++){
+ if(data[i].LAY_CHECKED){
+ if(!data[i].batch){
+ layer.msg("鏈夋湭濉啓瀛楁");
+ return;
+ }
+ data[i].step = 2;
+ dataSave.push(data[i]);
+ }else {
+ dataOld.push(data[i]);
+ }
+ }
+ $.ajax({
+ url: baseUrl+"/pla/update/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(dataSave),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg("鎻愪氦鎴愬姛");
+ table.reload('qualityInfoTable',{
+ data: dataOld
+ })
+ } else if (res.code === 403){
+
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ })
+
+})
+
diff --git a/src/main/webapp/static/js/pla/waitingPakin.js b/src/main/webapp/static/js/pla/waitingPakin.js
new file mode 100644
index 0000000..09674cd
--- /dev/null
+++ b/src/main/webapp/static/js/pla/waitingPakin.js
@@ -0,0 +1,177 @@
+var initCountVal = 0;
+var initAnfmeVal = "-";
+var matCodeData = [];
+var currLocNo;
+var matCodeLayerIdx;
+var data = [];
+var checkStatus = [];
+function getCol() {
+ var cols = [
+ {field: 'id', title: 'id', align: 'center',hide:true}
+ ,{type: 'checkbox'}
+ ,{field: 'pakinTime', title: '鍏ュ簱鏃堕棿', align: 'center'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'packageNo', align: 'center',title: '鍖呭彿'}
+ ,{field: 'brand', align: 'center',title: '鐗屽彿'}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺锛圞G锛�', hide:true}
+ ,{field: 'workshop', align: 'center',title: '鐢熶骇杞﹂棿', hide:true}
+ ,{field: 'line', align: 'center',title: '鐢熶骇绾�', hide:true}
+ ,{field: 'packageType', align: 'center',title: '鍖呰绫诲瀷', hide:true}
+ ,{field: 'zpalletType', align: 'center',title: '鎵樼洏绫诲瀷', hide:true}
+ ,{field: 'fingerMelting', align: 'center',title: '鐔旀寚锛坓/10min锛�'}
+ ,{field: 'fusingPoint', align: 'center',title: '鐔旂偣锛堚剝锛�'}
+ ,{field: 'vadf1', align: 'center',title: '鎸ュ彂浠�1锛�%锛�', hide:true}
+ ,{field: 'vadf2', align: 'center',title: '鎸ュ彂浠�2锛�%锛�', hide:true}
+ ,{field: 'yellowness', align: 'center',title: '榛勫害', hide:true}
+ ,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紙0-100%锛�', hide:true}
+ ,{field: 'water', align: 'center',title: '姘村垎锛坧pm锛�', hide:true}
+ ,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��', hide:true}
+ ,{field: 'problem', align: 'center',title: '璐ㄩ噺闂', hide:true}
+ ,{field: 'stash', align: 'center',title: '浠撳簱', edit:true}
+ ,{field: 'locNo', align: 'center',title: '搴撲綅', edit:true}
+ ];
+ return cols;
+}
+
+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: '#waitingPakinTable',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/pla/list/auth?step=2',
+ page: true,
+ limit: 16,
+ limits: [16, 30, 50, 100, 200, 500],
+ even: true,
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ cols: [getCol()],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ console.log(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+"/";
+ }
+ tableData = table.cache.locDetl;
+ console.log(tableData);
+ 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';
+ }
+ });
+ }
+ });
+
+
+ // 閲嶇疆浜嬩欢
+ form.on('submit(reset)', function (data) {
+ reset();
+ });
+
+ function reset() {
+ clearFormVal($('#search-box'));
+ matCodeData = [];
+ tableReload();
+ locTips(false);
+ }
+
+ // 閲嶈浇琛ㄦ牸
+ function tableReload() {
+ tableIns.reload({data: matCodeData});
+ }
+
+
+
+ $(document).on('click','#add', function () {
+ var now = dateToStr(new Date())
+ var newRow = {ioTime : now};
+ data = table.cache.waitingPakinTable;
+ data.push(newRow);
+ table.reload('waitingPakinTable',{
+ data: data
+ })
+ })
+
+ $(document).on('click','#delete', function () {
+ let dataNew = [];
+ let data = table.cache.waitingPakinTable;
+ for(var i=0; i<data.length; i++){
+ if(!data[i].LAY_CHECKED){
+ dataNew.push(data[i]);
+ }
+ }
+ table.reload('waitingPakinTable',{
+ data: dataNew
+ })
+ })
+
+ $(document).on('click','#submit', function () {
+ let data = table.cache.waitingPakinTable;
+ let dataSave = [];
+ let dataOld = [];
+ for(var i=0; i<data.length; i++){
+ if(data[i].LAY_CHECKED){
+ if(!data[i].batch){
+ layer.msg("鏈夋湭濉啓瀛楁");
+ return;
+ }
+ data[i].step = 3;
+ data[i].status = "寰呭叆搴�";
+ data[i].weightAnfme = data[i].weight;
+ dataSave.push(data[i]);
+ }else {
+ dataOld.push(data[i]);
+ }
+ }
+ $.ajax({
+ url: baseUrl+"/pla/update/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(dataSave),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg("鎻愪氦鎴愬姛");
+ table.reload('waitingPakinTable',{
+ data: dataOld
+ })
+ } else if (res.code === 403){
+
+ }else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ })
+
+})
+
diff --git a/src/main/webapp/views/pla/plaDetl.html b/src/main/webapp/views/pla/plaDetl.html
new file mode 100644
index 0000000..98ae191
--- /dev/null
+++ b/src/main/webapp/views/pla/plaDetl.html
@@ -0,0 +1,115 @@
+<!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">
+ <style>
+ html {
+ height: 100%;
+ padding: 10px;
+ background-color: #f1f1f1;
+ box-sizing: border-box;
+ }
+ body {
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ }
+
+ /* search */
+ .layui-card-header {
+ border-bottom: none;
+ }
+ #search-box {
+ padding: 30px 0 10px 0;
+ }
+ #search-box .layui-inline:first-child {
+ margin-left: 30px;
+ }
+ #search-box .layui-inline {
+ margin-right: 5px;
+ }
+
+ #data-search-btn {
+ margin-left: 10px;
+ display: inline-block;
+ }
+ #data-search-btn.layui-btn-container .layui-btn {
+ margin-right: 20px;
+ }
+
+ /* add */
+ .function-area {
+ padding: 15px 0 20px 40px;
+ }
+ .function-btn {
+ font-size: 16px;
+ padding: 1px 1px 1px 1px;
+ width: 120px;
+ height: 40px;
+ border-color: #2b425b;
+ border-radius: 4px;
+ border-width: 1px;
+ background: none;
+ border-style: solid;
+ transition: 0.4s;
+ cursor: pointer;
+ }
+ .function-btn:hover {
+ background-color: #2b425b;
+ color: #fff;
+ }
+
+ #mat-query {
+ /*display: none;*/
+ }
+ #btn-adjust {
+ /*display: none;*/
+ }
+
+ .layui-table-cell {
+ text-align: center;
+ line-height: 20px !important;
+ vertical-align: middle;
+ height: auto;
+ overflow: visible;
+ text-overflow: inherit;
+ white-space: normal;
+
+ }
+ </style>
+</head>
+<body style="padding-bottom: 30px">
+
+<hr>
+
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+ <button id="rework" style="alignment: right" class="function-btn">閲嶅仛</button>
+</div>
+
+<!-- 琛� -->
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
+</script>
+
+<!-- 琛ㄦ牸 -->
+<table class="layui-table" id="plaDetl" lay-filter="plaDetl"></table>
+
+<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/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/pla/plaDetl.js" charset="utf-8"></script>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/pla/productionInfo.html b/src/main/webapp/views/pla/productionInfo.html
index e8157c2..7368b02 100644
--- a/src/main/webapp/views/pla/productionInfo.html
+++ b/src/main/webapp/views/pla/productionInfo.html
@@ -73,6 +73,16 @@
#btn-adjust {
/*display: none;*/
}
+ .layui-table-cell {
+ text-align: center;
+ line-height: 20px !important;
+ vertical-align: middle;
+ height: auto;
+ overflow: visible;
+ text-overflow: inherit;
+ white-space: normal;
+
+ }
</style>
</head>
<body style="padding-bottom: 30px">
diff --git a/src/main/webapp/views/pla/qualityInfo.html b/src/main/webapp/views/pla/qualityInfo.html
new file mode 100644
index 0000000..f18b30d
--- /dev/null
+++ b/src/main/webapp/views/pla/qualityInfo.html
@@ -0,0 +1,114 @@
+<!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">
+ <style>
+ html {
+ height: 100%;
+ padding: 10px;
+ background-color: #f1f1f1;
+ box-sizing: border-box;
+ }
+ body {
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ }
+
+ /* search */
+ .layui-card-header {
+ border-bottom: none;
+ }
+ #search-box {
+ padding: 30px 0 10px 0;
+ }
+ #search-box .layui-inline:first-child {
+ margin-left: 30px;
+ }
+ #search-box .layui-inline {
+ margin-right: 5px;
+ }
+
+ #data-search-btn {
+ margin-left: 10px;
+ display: inline-block;
+ }
+ #data-search-btn.layui-btn-container .layui-btn {
+ margin-right: 20px;
+ }
+
+ /* add */
+ .function-area {
+ padding: 15px 0 20px 40px;
+ }
+ .function-btn {
+ font-size: 16px;
+ padding: 1px 1px 1px 1px;
+ width: 120px;
+ height: 40px;
+ border-color: #2b425b;
+ border-radius: 4px;
+ border-width: 1px;
+ background: none;
+ border-style: solid;
+ transition: 0.4s;
+ cursor: pointer;
+ }
+ .function-btn:hover {
+ background-color: #2b425b;
+ color: #fff;
+ }
+
+ #mat-query {
+ /*display: none;*/
+ }
+ #btn-adjust {
+ /*display: none;*/
+ }
+ .layui-table-cell {
+ text-align: center;
+ line-height: 20px !important;
+ vertical-align: middle;
+ height: auto;
+ overflow: visible;
+ text-overflow: inherit;
+ white-space: normal;
+
+ }
+ </style>
+</head>
+<body style="padding-bottom: 30px">
+
+<hr>
+
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+ <button id="submit" style="alignment: right" class="function-btn">鎻愪氦</button>
+</div>
+
+<!-- 琛� -->
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
+</script>
+
+<!-- 琛ㄦ牸 -->
+<table class="layui-table" id="qualityInfoTable" lay-filter="qualityInfoTable"></table>
+
+<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/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/pla/qualityInfo.js" charset="utf-8"></script>
+
+</body>
+</html>
+
diff --git a/src/main/webapp/views/pla/waitingPakin.html b/src/main/webapp/views/pla/waitingPakin.html
new file mode 100644
index 0000000..4a03807
--- /dev/null
+++ b/src/main/webapp/views/pla/waitingPakin.html
@@ -0,0 +1,114 @@
+<!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">
+ <style>
+ html {
+ height: 100%;
+ padding: 10px;
+ background-color: #f1f1f1;
+ box-sizing: border-box;
+ }
+ body {
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ }
+
+ /* search */
+ .layui-card-header {
+ border-bottom: none;
+ }
+ #search-box {
+ padding: 30px 0 10px 0;
+ }
+ #search-box .layui-inline:first-child {
+ margin-left: 30px;
+ }
+ #search-box .layui-inline {
+ margin-right: 5px;
+ }
+
+ #data-search-btn {
+ margin-left: 10px;
+ display: inline-block;
+ }
+ #data-search-btn.layui-btn-container .layui-btn {
+ margin-right: 20px;
+ }
+
+ /* add */
+ .function-area {
+ padding: 15px 0 20px 40px;
+ }
+ .function-btn {
+ font-size: 16px;
+ padding: 1px 1px 1px 1px;
+ width: 120px;
+ height: 40px;
+ border-color: #2b425b;
+ border-radius: 4px;
+ border-width: 1px;
+ background: none;
+ border-style: solid;
+ transition: 0.4s;
+ cursor: pointer;
+ }
+ .function-btn:hover {
+ background-color: #2b425b;
+ color: #fff;
+ }
+
+ #mat-query {
+ /*display: none;*/
+ }
+ #btn-adjust {
+ /*display: none;*/
+ }
+ .layui-table-cell {
+ text-align: center;
+ line-height: 20px !important;
+ vertical-align: middle;
+ height: auto;
+ overflow: visible;
+ text-overflow: inherit;
+ white-space: normal;
+
+ }
+ </style>
+</head>
+<body style="padding-bottom: 30px">
+
+<hr>
+
+<!-- 鍔熻兘鍖� -->
+<div class="function-area">
+ <button id="submit" style="alignment: right" class="function-btn">閫氱煡鍏ュ簱</button>
+</div>
+
+<!-- 琛� -->
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">绉婚櫎</a>
+</script>
+
+<!-- 琛ㄦ牸 -->
+<table class="layui-table" id="waitingPakinTable" lay-filter="qualityInfoTable"></table>
+
+<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/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/pla/waitingPakin.js" charset="utf-8"></script>
+
+</body>
+</html>
+
--
Gitblit v1.9.1