From 56e2544343ec595f9f5ad7c6b0457188916a9043 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 12 十二月 2025 15:04:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 1
src/main/webapp/static/js/taskLog/taskLog.js | 3
src/main/webapp/views/taskLog/taskDetlLog.html | 99 ++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 29 +-----
src/main/java/com/zy/asrs/controller/TaskDetlLogController.java | 18 ++++
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 31 ++++---
src/main/webapp/static/js/common.js | 1
8 files changed, 145 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskDetlLogController.java b/src/main/java/com/zy/asrs/controller/TaskDetlLogController.java
index 3622acc..55e6ac6 100644
--- a/src/main/java/com/zy/asrs/controller/TaskDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskDetlLogController.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.TaskDetlLog;
+import com.zy.asrs.entity.WrkDetlLog;
import com.zy.asrs.service.TaskDetlLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -24,6 +25,23 @@
@Autowired
private TaskDetlLogService taskDetlLogService;
+
+ @RequestMapping(value = "/taskDetlLogByMast/list/auth")
+ @ManagerAuth
+ public R list1(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Integer wrk_no,
+ @RequestParam String id) {
+ EntityWrapper<TaskDetlLog> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(wrk_no) && wrk_no != 0) {
+ wrapper.eq("wrk_no", wrk_no);
+ }
+ if (!Cools.isEmpty(id)) {
+ wrapper.eq("log_id",id);
+ }
+ return R.ok(taskDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
@RequestMapping(value = "/taskDetlLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
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 93237b3..3e1ca03 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1695,8 +1695,7 @@
throw new CoolException("鏄庣粏鍐呭涓嶅瓨鍦紒锛�");
}
- Double v = Math.round((stationDetl.getAnfme() - stationDetl.getWorkQty()) * 10000) / 10000.0;
-
+ Double v = stationDetl.getAnfme() - stationDetl.getWorkQty();
if (detlDto.getAnfme().compareTo(v) > 0) {
throw new CoolException("缁勬墭涓婇檺涓猴細" + stationDetl.getAnfme() + ", 宸茬粍鎵橈細" + stationDetl.getWorkQty() + ", 杩樺彲缁勬墭锛�" + v);
}
@@ -1727,7 +1726,7 @@
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
- Double v1 = Math.round((stationDetl.getWorkQty() + detlDto.getAnfme()) * 10000) / 10000.0 ;
+ Double v1 = stationDetl.getWorkQty() + detlDto.getAnfme();
stationDetl.setWorkQty(v1);
if (!basStationDetlService.updateById(stationDetl)) {
@@ -1737,19 +1736,6 @@
if (v1.compareTo(stationDetl.getWorkQty()) >= 0) {
if (!basStationDetlService.deleteById(stationDetl)) {
throw new CoolException("鍘熷鏁版嵁绉婚櫎澶辫触锛�");
- }
- }
-
- List<BasStationDetl> devNo = basStationDetlService.selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", stationDetl.getDevNo()));
- if (Objects.isNull(devNo) || devNo.isEmpty()) {
- BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
- .eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
- .eq("dev_no", stationDetl.getDevNo()));
- if (!Objects.isNull(station)) {
- station.setLocSts(LocStsType.LOC_STS_TYPE_D.type);
- if (!basStationService.updateById(station)) {
- throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐锛侊紒");
- }
}
}
@@ -1792,11 +1778,11 @@
throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
}
-// station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
-// if (!basStationService.updateById(station)) {
-// throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐�!");
-// }
-// basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
+ station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("绔欑偣鐘舵�佷慨鏀瑰け璐�!");
+ }
+ basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
// // 浠诲姟瀹屾垚
// task.setWrkSts(15L);
@@ -1989,7 +1975,6 @@
waitPakins.forEach(waitPakin -> {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(waitPakin);
- wrkDetl.setSuppCode(waitPakin.getSuppCode());
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index ca9d398..c175ce5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -418,7 +418,7 @@
.eq("loc_no", locDto.getLocNo())
.eq("matnr", locDto.getMatnr())
.eq("batch", locDto.getBatch())
- .eq("standby1",locDto.getStandby2())
+ .eq("standby1",locDto.getStandby1())
).getDiffQty().compareTo(BigDecimal.ZERO) == 0
);
if (!DiffQty){
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 013cf95..4277ac2 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -191,21 +191,6 @@
// }
}
-
-
- for (TaskDetl taskDetl :taskDetls){
- TaskDetlLog taskDetlLog = new TaskDetlLog();
- BeanUtils.copyProperties(taskDetl, taskDetlLog);
-
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!taskDetlLogService.insert(taskDetlLog)) {
- exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", task.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔鏄庣粏妗�
- if (!taskDetlService.deleteById(taskDetl)) {
- exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", task.getWrkNo());
- }
- }
TaskLog taskLog = new TaskLog();
BeanUtils.copyProperties(task, taskLog);
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
@@ -217,6 +202,22 @@
if (!taskService.deleteById(task)) {
exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", task.getWrkNo());
}
+ List<TaskDetl> taskDetls2 = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
+ for (TaskDetl taskDetl :taskDetls2){
+ TaskDetlLog taskDetlLog = new TaskDetlLog();
+ BeanUtils.copyProperties(taskDetl, taskDetlLog);
+ taskDetlLog.setLogId(taskLog.getId());
+ taskDetlLog.setId(null);
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ if (!taskDetlLogService.insert(taskDetlLog)) {
+ exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", task.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔鏄庣粏妗�
+ if (!taskDetlService.deleteById(taskDetl)) {
+ exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", task.getWrkNo());
+ }
+ }
+
} catch (Exception e) {
log.error("fail", e);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 020c0d7..41acd02 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -859,6 +859,7 @@
if (Objects.isNull(apallet)) {
throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻暟鎹笉瀛樺湪锛侊紒");
}
+ log.info(apallet.size() + "-------------------------------------------------------------------");
apallet.forEach(pakin -> {
LocDetl detl = new LocDetl();
BeanUtils.copyProperties(pakin, detl);
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 5eaadd9..f42a5f1 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -223,6 +223,7 @@
var cacheCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
+ ,{field: 'standby1', align: 'center',title: '渚涘簲鍟嗕唬鐮�', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
,{field: 'tag$', align: 'center',title: '闆朵欢绫诲瀷', hide: false}
diff --git a/src/main/webapp/static/js/taskLog/taskLog.js b/src/main/webapp/static/js/taskLog/taskLog.js
index 049f72c..f4b4051 100644
--- a/src/main/webapp/static/js/taskLog/taskLog.js
+++ b/src/main/webapp/static/js/taskLog/taskLog.js
@@ -101,6 +101,7 @@
case 'detlShow':
wrkNo = data.wrkNo;
ioTime = data.ioTime;
+ id = data.id;
// 琛ㄦ牸涓嬫柟鏄剧ず
// locDetl(data.wrkNo);
// 寮瑰眰鏄剧ず
@@ -110,7 +111,7 @@
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
- content: 'taskLog_detail.html',
+ content: 'taskDetlLog.html',
success: function (layero, index) {
}
});
diff --git a/src/main/webapp/views/taskLog/taskDetlLog.html b/src/main/webapp/views/taskLog/taskDetlLog.html
new file mode 100644
index 0000000..f2fdde0
--- /dev/null
+++ b/src/main/webapp/views/taskLog/taskDetlLog.html
@@ -0,0 +1,99 @@
+<!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">
+ <style>
+ </style>
+</head>
+<body>
+<div class="layui-inline" style="width:20%;margin-top: 20px">
+ <label class="layui-form-label">宸� 浣� 鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="wrkNo" class="layui-input" type="text" disabled="disabled">
+ </div>
+</div>
+<div class="layui-inline" style="width:20%;margin-top: 20px">
+ <label class="layui-form-label">宸ヤ綔鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="ioTime" class="layui-input" type="text" disabled="disabled">
+ </div>
+</div>
+
+<table class="layui-hide" id="wrkDetlLogByMast" lay-filter="wrkDetlLogByMast"></table>
+</body>
+<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/locMast/locMast.js" charset="utf-8"></script>
+<script type="text/javascript">
+ var pageCur;
+ function getCol() {
+ let cols = [
+ {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',width:160}
+ ];
+ cols.push.apply(cols, detlCols);
+ return cols;
+ }
+ layui.use(['table','laydate', 'form'], function() {
+ table = layui.table;
+ var $ = layui.jquery;
+ var form = layui.form;
+
+ $('#wrkNo').val(parent.wrkNo);
+ $('#ioTime').val(top.dateToStr(parent.ioTime, true));
+ // 鏁版嵁娓叉煋
+ tableIns1 = table.render({
+ elem: '#wrkDetlLogByMast',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/taskDetlLogByMast/list/auth',
+ where: {wrk_no: parent.wrkNo,id: parent.id},
+ 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) {
+ 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+"/";
+ }
+ pageCur=curr;
+ 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';
+ }
+ });
+ }
+ });
+ });
+</script>
+</html>
+
--
Gitblit v1.9.1