From 35309c86535d392d593471236585b4b36fb417d6 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 15 一月 2024 15:19:48 +0800
Subject: [PATCH] # 需求更改
---
src/main/java/com/zy/asrs/controller/PlaController.java | 38 +++++++++
src/main/webapp/views/pla/update.html | 20 ++--
src/main/java/com/zy/asrs/entity/Pla.java | 51 +++++++++---
src/main/webapp/views/pla/returned.html | 2
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 16 +++
src/main/webapp/views/pla/sellout.html | 1
src/main/java/com/zy/asrs/service/PlaService.java | 1
src/main/java/com/zy/asrs/utils/PlaExcelListener.java | 9 +-
src/main/webapp/views/pla/plaDetl.html | 2
src/main/java/com/zy/asrs/controller/NodeController.java | 2
src/main/java/com/zy/asrs/entity/param/GlobleParameter.java | 1
src/main/webapp/static/js/pla/plaDetl.js | 62 +++++++++++++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 9 +-
13 files changed, 176 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 15baa78..84356f1 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -385,7 +385,7 @@
}
}else {
- locNo = param.getName()+"-" +String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
+ locNo = param.getName()+String.format("%02d", r) + String.format("%02d", b) + String.format("%02d", l);
}
//瀹㈡埛瑕佹眰鏍煎紡浣岮-01-01-01
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 815f418..3b458b1 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -9,6 +9,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.GlobleParameter;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.PlaExcelListener;
import com.zy.asrs.utils.SaasUtils;
@@ -75,11 +76,37 @@
System.out.println(plas.toString());
plas.forEach(pla -> {
Pla plaSave = plaService.selectById(pla.getId());
+ pla.setModifyTime(new Date());
+ plaService.updateById(pla);
+
PlaLog plaLog = new PlaLog();
BeanUtils.copyProperties(plaSave,plaLog);
plaLog.setId(null);
+ plaLog.setCreateTime(new Date());
plaLogService.insert(plaLog);
- plaService.updateById(pla);
+
+ });
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/pla/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestBody List<Pla> plas) {
+ System.out.println(plas.toString());
+ plas.forEach(pla -> {
+ if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00) || pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
+ throw new CoolException("闈炲緟鍏ュ簱鐨勬暟鎹棤娉曡鍒犻櫎");
+ }
+ Pla plaSave = plaService.selectById(pla.getId());
+ pla.setModifyTime(new Date());
+ plaService.deleteById(pla.getId());
+
+ PlaLog plaLog = new PlaLog();
+ BeanUtils.copyProperties(plaSave,plaLog);
+ plaLog.setId(null);
+ plaLog.setCreateTime(new Date());
+ plaLogService.insert(plaLog);
+
});
return R.ok();
}
@@ -111,7 +138,7 @@
}
pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight());
pla.setHandlerBy(getUser().getUsername());
- pla.setStatus("寰呭嚭搴�");
+ pla.setStatus(GlobleParameter.PLA_STATUS_2);
pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
//鐢熸垚姝ゆ浣滀笟淇℃伅
PlaQty plaQty = new PlaQty();
@@ -149,6 +176,13 @@
return R.ok();
}
+ @RequestMapping(value = "/pla/viladate/auth")
+ @ManagerAuth
+ public R viladate(@RequestBody List<Pla> plas) {
+ plaService.viladate(plas,getUser());
+ return R.ok();
+ }
+
@RequestMapping(value = "/pla/rework/auth")
@ManagerAuth
public R rework(@RequestBody List<Pla> plas) {
diff --git a/src/main/java/com/zy/asrs/entity/Pla.java b/src/main/java/com/zy/asrs/entity/Pla.java
index 9b7a25b..209dd5e 100644
--- a/src/main/java/com/zy/asrs/entity/Pla.java
+++ b/src/main/java/com/zy/asrs/entity/Pla.java
@@ -76,11 +76,11 @@
//閲嶉噺
@TableField("weight")
- @ExcelProperty(value = "閲嶉噺")
+ @ExcelProperty(value = "閲嶉噺KG")
private Double weight;
@ApiModelProperty(value= "鍗曚綅")
- @ExcelProperty(value = "鍗曚綅")
+ //@ExcelProperty(value = "鍗曚綅")
@TableField("unit")
private String unit;
@@ -101,27 +101,27 @@
//鐔旀寚
@TableField("finger_melting")
- @ExcelProperty(value = "鐔旀寚")
+ @ExcelProperty(value = "鐔旀寚,g/10min")
private Double fingerMelting;
//姘村垎
@TableField("water")
- @ExcelProperty(value = "姘村垎")
+ @ExcelProperty(value = "姘村垎,ppm")
private Double water;
//鐔旂偣
@TableField("fusing_point")
- @ExcelProperty(value = "鐔旂偣")
+ @ExcelProperty(value = "鐔旂偣,鈩�")
private Double fusingPoint;
//鎸ュ彂浠�1
@TableField("vadf1")
- @ExcelProperty(value = "鎸ュ彂浠�1")
+ @ExcelProperty(value = "鎸ュ彂娈�,%")
private Double vadf1;
//鎸ュ彂浠�2
@TableField("vadf2")
- @ExcelProperty(value = "鎸ュ彂浠�2")
+ @ExcelProperty(value = "鍒嗚В娈�,%")
private Double vadf2;
//榛勫害
@@ -131,32 +131,57 @@
//涓嶉�忔槑搴�
@TableField("opacity")
- @ExcelProperty(value = "涓嶉�忔槑搴�")
+ @ExcelProperty(value = "涓嶉�忔槑搴�,%")
private Double opacity;
//L鍊�
@TableField("l")
- @ExcelProperty(value = "l鍊�")
+ @ExcelProperty(value = "L*")
private Double l;
//a鍊�
@TableField("a")
- @ExcelProperty(value = "a鍊�")
+ @ExcelProperty(value = "a*")
private Double a;
//b鍊�
@TableField("b")
- @ExcelProperty(value = "b鍊�")
+ @ExcelProperty(value = "b*")
private Double b;
//濉厖
@TableField("fill_in")
- @ExcelProperty(value = "濉厖")
+ @ExcelProperty(value = "濉厖,%")
private Double fillIn;
+
+ @ExcelProperty(value = "鎷変几寮哄害,MPa")
+ private String str1;
+
+ @ExcelProperty(value = "鏂浼搁暱鐜�,%")
+ private String str2;
+
+ @ExcelProperty(value = "缂哄彛鍐插嚮,KJ/m2")
+ private String str3;
+
+ @ExcelProperty(value = "缁村崱,鈩�")
+ private String str4;
+
+ @ExcelProperty(value = "鍗婄粨鏅舵椂闂�,min")
+ private String str5;
+
+ @ExcelProperty(value = "缁撴櫠搴�.%")
+ private String str6;
+
+// @ExcelProperty(value = "濉厖")
+ private String str7;
+//
+// @ExcelProperty(value = "濉厖")
+ private String str8;
+
//璐ㄩ噺鐘舵��
@TableField("mass_state")
- @ExcelProperty(value = "璐ㄩ噺鐘朵綋")
+ @ExcelProperty(value = "璐ㄩ噺鐘舵��")
private String massState;
//璐ㄩ噺闂
diff --git a/src/main/java/com/zy/asrs/entity/param/GlobleParameter.java b/src/main/java/com/zy/asrs/entity/param/GlobleParameter.java
index dbf4d5f..0beaa52 100644
--- a/src/main/java/com/zy/asrs/entity/param/GlobleParameter.java
+++ b/src/main/java/com/zy/asrs/entity/param/GlobleParameter.java
@@ -1,6 +1,7 @@
package com.zy.asrs.entity.param;
public class GlobleParameter {
+ public static final String PLA_STATUS_00 = "鏆傚叆搴�";
public static final String PLA_STATUS_0 = "寰呭叆搴�";
public static final String PLA_STATUS_1 = "宸插叆搴�";
public static final String PLA_STATUS_2 = "寰呭嚭搴�";
diff --git a/src/main/java/com/zy/asrs/service/PlaService.java b/src/main/java/com/zy/asrs/service/PlaService.java
index b0dd42e..3e0d195 100644
--- a/src/main/java/com/zy/asrs/service/PlaService.java
+++ b/src/main/java/com/zy/asrs/service/PlaService.java
@@ -16,4 +16,5 @@
void returned(List<PlaQty> plaQties, User user);
+ void viladate(List<Pla> plas, User user);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 6b9f66b..27279f6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1211,9 +1211,10 @@
throw new CoolException("绯荤粺鏈娴嬪埌璇ュ寘鐗╂枡淇℃伅锛岃閲嶆柊褰曞叆");
}
- if(Cools.eq(GlobleParameter.PLA_STATUS_1,pla.getStatus())){
- throw new CoolException("璇ョ墿鏂欏凡鍏ュ簱");
+ if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
+ throw new CoolException("璇ョ墿鏂欑姸鎬佷笉涓哄緟鍏ュ簱锛屾棤娉曞叆搴�");
}
+
pla.setStatus(GlobleParameter.PLA_STATUS_1);
pla.setModifyTime(new Date());
pla.setPakinTime(new Date());
@@ -1260,9 +1261,9 @@
pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
pla.setQtyAnfme(pla.getQtyAnfme() - anfme);
if(pla.getWeightAnfme() <= 0){
- pla.setStatus("鍏ㄩ儴鍑哄簱");
+ pla.setStatus(GlobleParameter.PLA_STATUS_4);
}else {
- pla.setStatus("閮ㄥ垎鍑哄簱");
+ pla.setStatus(GlobleParameter.PLA_STATUS_3);
}
plaService.updateById(pla);
SaasUtils.insertLog(1,locNo,batch+","+packageNo,anfme,null);
diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index 80f23d4..55d65d0 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.Pla;
import com.zy.asrs.entity.PlaQty;
@@ -118,7 +119,7 @@
Pla pla = this.selectByBatchAndPackageNo(plaQty.getBatch(), plaQty.getPackageNo());
//pla.setStatus(GlobleParameter.PLA_STATUS_0);
- pla.setWeightAnfme(plaQty.getOrderWeight());
+ pla.setWeightAnfme(pla.getWeightAnfme() + plaQty.getOrderWeight());
pla.setStatus(GlobleParameter.PLA_STATUS_1);
this.updateById(pla);
@@ -126,4 +127,17 @@
});
}
+
+ @Override
+ @Transactional
+ public void viladate(List<Pla> plas, User user) {
+ plas.forEach(pla -> {
+ if(!pla.getStatus().equals(GlobleParameter.PLA_STATUS_00)){
+ throw new CoolException("閫変腑鐨勬暟鎹笉鏄殏鍏ュ簱鐘舵�侊紝璇锋牳瀵圭姸鎬�");
+ }
+ pla = this.selectById(pla.getId());
+ pla.setStatus(GlobleParameter.PLA_STATUS_0);
+ this.updateById(pla);
+ });
+ }
}
diff --git a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
index b44a089..581c228 100644
--- a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
@@ -65,17 +65,18 @@
pla = excel;
pla.setStep(2);
pla.setCreateTime(new Date());
- pla.setStatus(GlobleParameter.PLA_STATUS_0);
+ pla.setModifyTime(new Date());
+ pla.setStatus(GlobleParameter.PLA_STATUS_00);
if (!plaService.insert(pla)) {
throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
}
total++;
- }else if (pla.getStatus().equals(GlobleParameter.PLA_STATUS_0)){
+ }else if (pla.getStatus().equals(GlobleParameter.PLA_STATUS_00)){
excel.setId(pla.getId());
excel.setCreateTime(pla.getCreateTime());
- excel.setModifyTime(pla.getModifyTime());
+ excel.setModifyTime(new Date());
excel.setStep(2);
- excel.setStatus(GlobleParameter.PLA_STATUS_0);
+ excel.setStatus(GlobleParameter.PLA_STATUS_00);
BeanUtils.copyProperties(excel,pla);
plaService.updateById(pla);
total++;
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 2bae082..85460e4 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -37,6 +37,12 @@
,{field: 'a', align: 'center',title: 'a鍊�', hide:true,edit:true}
,{field: 'b', align: 'center',title: 'b鍊�', hide:true,edit:true}
,{field: 'fillIn', align: 'center',title: '濉厖(%)',hide:true,edit:true}
+ ,{field: 'str1', align: 'center',title: '鎷変几寮哄害MPa',hide:true,edit:true}
+ ,{field: 'str2', align: 'center',title: '鏂浼搁暱鐜�%',hide:true,edit:true}
+ ,{field: 'str3', align: 'center',title: '缂哄彛鍐插嚮KJ/m2',hide:true,edit:true}
+ ,{field: 'str4', align: 'center',title: '缁村崱鈩�',hide:true,edit:true}
+ ,{field: 'str5', align: 'center',title: '鍗婄粨鏅舵椂闂磎in',hide:true,edit:true}
+ ,{field: 'str6', align: 'center',title: '缁撴櫠搴�%',hide:true,edit:true}
,{field: 'massState', align: 'center',title: '璐ㄩ噺鐘舵��',edit:true}
,{field: 'problem', align: 'center',title: '澶囨敞',edit:true}
,{field: 'stash', align: 'center',title: '浠撳簱',edit:true}
@@ -68,6 +74,8 @@
return "<span style='color: black'>閮ㄥ垎鍑哄簱</span>"
}else if(data.status === "鍏ㄩ儴鍑哄簱"){
return "<span style='color: gray'>鍏ㄩ儴鍑哄簱</span>"
+ }else if(data.status === "鏆傚叆搴�"){
+ return "<span style='color: purple'>鏆傚叆搴�</span>"
}
}
@@ -226,7 +234,59 @@
});
}
break;
-
+ case "deleteData":
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鍒犻櫎'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/pla/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
+ break;
+ case "viladate":
+ var data = checkStatus.data;
+ if (data.length === 0){
+ layer.msg('璇烽�夋嫨鏁版嵁');
+ } else {
+ layer.confirm('纭畾鏍￠獙'+(data.length===1?'姝�':data.length)+'鏉℃暟鎹悧', function(){
+ $.ajax({
+ url: baseUrl+"/pla/viladate/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(data),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ traditional:true,
+ success: function (res) {
+ if (res.code === 200){
+ layer.closeAll();
+ tableReload(false);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
+ });
+ }
}
})
diff --git a/src/main/webapp/views/pla/plaDetl.html b/src/main/webapp/views/pla/plaDetl.html
index 4391965..521a0b2 100644
--- a/src/main/webapp/views/pla/plaDetl.html
+++ b/src/main/webapp/views/pla/plaDetl.html
@@ -205,6 +205,8 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData" style="display: none">鍒犻櫎</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-update" lay-event="updateData" style="display: none">淇敼</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-viladate" lay-event="viladate" style="display: none">鏍￠獙</button>
+
<!-- 鍟嗗搧/鐗╂枡 鏁版嵁涓績 -->
<div class="dropdown-menu" style="float: right">
<button class="layui-btn layui-btn-primary layui-border-black icon-btn layui-btn-sm"> 鏁版嵁鍚屾 <i class="layui-icon layui-icon-drop"></i></button>
diff --git a/src/main/webapp/views/pla/returned.html b/src/main/webapp/views/pla/returned.html
index 66967dc..1442583 100644
--- a/src/main/webapp/views/pla/returned.html
+++ b/src/main/webapp/views/pla/returned.html
@@ -151,6 +151,7 @@
table.reload('productionInfoTable',{
data: dataOld
})
+ parent.layer.closeAll();
} else if (res.code === 403){
}else {
@@ -161,7 +162,6 @@
});
function tableReload(child) {
- debugger
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
diff --git a/src/main/webapp/views/pla/sellout.html b/src/main/webapp/views/pla/sellout.html
index 72e7672..51ffc6b 100644
--- a/src/main/webapp/views/pla/sellout.html
+++ b/src/main/webapp/views/pla/sellout.html
@@ -247,7 +247,6 @@
}
for (var i in checkData){
- checkData[i].type = 'sellOut';
checkData[i].orderNo = $('#orderNoV').val();
checkData[i].customer = $('#customer').val();
checkData[i].phone = $('#phone').val();
diff --git a/src/main/webapp/views/pla/update.html b/src/main/webapp/views/pla/update.html
index 7a5fc67..ca3b65d 100644
--- a/src/main/webapp/views/pla/update.html
+++ b/src/main/webapp/views/pla/update.html
@@ -17,9 +17,9 @@
<form id="detail" class="layui-form" style="text-align: center">
<div class="layui-inline" style="width:80%;">
- <label class="layui-form-label"><span class="not-null">*</span>鎹㈠寘瑁咃細</label>
+ <label class="layui-form-label">鎹㈠寘瑁咃細</label>
<div class="layui-input-inline cool-auto-complete">
- <input id="packageType" class="layui-input" type="text" style="display: none" lay-verify="required">
+ <input id="packageType" class="layui-input" type="text" style="display: none">
<input id="packageTypeV" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
<div class="cool-auto-complete-window">
<input class="cool-auto-complete-window-input" data-key="configTypeQueryByPackageType" data-value="packageType" onkeyup="autoLoad(this.getAttribute('data-key'))">
@@ -29,9 +29,9 @@
</div>
</div>
<div class="layui-inline" style="width:80%;">
- <label class="layui-form-label"><span class="not-null">*</span>鎹㈡墭鐩橈細</label>
+ <label class="layui-form-label">鎹㈡墭鐩橈細</label>
<div class="layui-input-inline cool-auto-complete">
- <input id="zpalletType" class="layui-input" type="text" style="display: none" lay-verify="required">
+ <input id="zpalletType" class="layui-input" type="text" style="display: none">
<input id="zpalletTypeV" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
<div class="cool-auto-complete-window">
<input class="cool-auto-complete-window-input" data-key="configTypeQueryByzpalletType" data-value="zpalletType" onkeyup="autoLoad(this.getAttribute('data-key'))">
@@ -41,9 +41,9 @@
</div>
</div>
<div class="layui-inline" style="width:80%;">
- <label class="layui-form-label"><span class="not-null">*</span>缂犺啘锛�</label>
+ <label class="layui-form-label">缂犺啘锛�</label>
<div class="layui-input-inline cool-auto-complete">
- <input id="filmWrap" class="layui-input" type="text" style="display: none" lay-verify="required">
+ <input id="filmWrap" class="layui-input" type="text" style="display: none" >
<input id="filmWrapV" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" onfocus=this.blur()>
<div class="cool-auto-complete-window">
<input class="cool-auto-complete-window-input" data-key="configTypeQueryByfilmWrap" data-value="filmWrap" onkeyup="autoLoad(this.getAttribute('data-key'))">
@@ -83,10 +83,10 @@
form.on('submit(save)', function () {
for(var i in checkData){
- checkData[i].packageType = $('#packageTypeV').val();
- checkData[i].zpalletType = $('#zpalletTypeV').val();
- checkData[i].filmWrap = $('#filmWrapV').val();
- checkData[i].step = 3;
+ checkData[i].packageType = $('#packageTypeV').val() ? $('#packageTypeV').val() : checkData[i].packageType;
+ checkData[i].zpalletType = $('#zpalletTypeV').val() ? $('#zpalletTypeV').val() : checkData[i].zpalletType;
+ checkData[i].filmWrap = $('#filmWrapV').val() ? $('#filmWrapV').val() : checkData[i].filmWrap;
+ checkData[i].step = 2;
}
$.ajax({
--
Gitblit v1.9.1