From e0b041aca4e2ed0e0881e596c6cd1ec3dc63ddba Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 09 一月 2026 15:51:20 +0800
Subject: [PATCH] #
---
src/main/webapp/views/report/viewWorkOut.html | 5 ++
src/main/webapp/views/matInOut/matInOut.html | 17 ++++++++
src/main/resources/mapper/ViewWorkInMapper.xml | 3 +
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 38 +++++++++++++++---
src/main/webapp/views/report/viewWorkIn.html | 5 ++
5 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index bd1e371..9c4cb27 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -1,21 +1,18 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -36,6 +33,33 @@
private WrkDetlService wrkDetlService;
@Autowired
private OrderDetlMapper orderDetlMapper;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
+ @Autowired
+ private MatService matService;
+
+
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+// @Transactional(rollbackFor = Exception.class)
+ private void replenishColor() {
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectList(new EntityWrapper<WrkDetlLog>().isNull("color"));
+ for (WrkDetlLog wrkDetlLog : wrkDetlLogs) {
+ Mat mat = matService.selectByMatnr(wrkDetlLog.getMatnr());
+ if(null==mat){
+ wrkDetlLog.setColor("鏈煡");
+ }else {
+ wrkDetlLog.setColor(mat.getColor());
+ }
+ boolean update = wrkDetlLogService.update(wrkDetlLog, new EntityWrapper<WrkDetlLog>()
+ .eq("wrk_no", wrkDetlLog.getWrkNo())
+ .eq("matnr", wrkDetlLog.getMatnr())
+ .eq(!Cools.isEmpty(wrkDetlLog.getIoTime()),"io_time", wrkDetlLog.getIoTime()));
+ if (!update) {
+ throw new CoolException("鐘舵�佷负绌猴紝鏇存柊鍘嗗彶妗ｅけ璐�");
+ }
+ }
+ }
@Scheduled(cron = "0/3 * * * * ? ")
private void execute() {
diff --git a/src/main/resources/mapper/ViewWorkInMapper.xml b/src/main/resources/mapper/ViewWorkInMapper.xml
index 3104cb0..073e2f8 100644
--- a/src/main/resources/mapper/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/ViewWorkInMapper.xml
@@ -48,6 +48,9 @@
<if test="specs != null and specs != ''">
and specs like concat('%',#{specs},'%')
</if>
+ <if test="color != null and color != ''">
+ and color like concat('%',#{color},'%')
+ </if>
<if test="outOrderNo != null and outOrderNo != ''">
and out_order_no like concat('%',#{outOrderNo},'%')
</if>
diff --git a/src/main/webapp/views/matInOut/matInOut.html b/src/main/webapp/views/matInOut/matInOut.html
index 411fa01..2ecfb94 100644
--- a/src/main/webapp/views/matInOut/matInOut.html
+++ b/src/main/webapp/views/matInOut/matInOut.html
@@ -51,6 +51,23 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <select name="color" id="color" class="layui-input" type="text" placeholder="鐘舵��" autocomplete="off">
+ <option value="">鐘舵��</option>
+ <option value="姝ｅ父">姝ｅ父</option>
+ <option value="鎶ュ簾">鎶ュ簾</option>
+ <option value="璇曟ā">璇曟ā</option>
+ <option value="涓婃満">涓婃満</option>
+ <option value="鎺ユ敹">鎺ユ敹</option>
+ <option value="鏈哄彴">鏈哄彴</option>
+ <option value="灏佸瓨">灏佸瓨</option>
+ <option value="杩斾慨寰呮">杩斾慨寰呮</option>
+ <option value="杩斿巶缁翠慨">杩斿巶缁翠慨</option>
+
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<select name="temp1" id="temp1" class="layui-input" type="text" placeholder="灞炴��" autocomplete="off">
<option value="">灞炴��</option>
<option value="鍦ㄥ簱">鍦ㄥ簱</option>
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 4a6af8d..d969405 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -41,6 +41,11 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="color" placeholder="鐘舵��" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="batch" placeholder="璐у搧鐗瑰緛" autocomplete="off">
</div>
</div>
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index 8862e01..e328f38 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -41,6 +41,11 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="color" placeholder="鐘舵��" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="batch" placeholder="璐у搧鐗瑰緛" autocomplete="off">
</div>
</div>
--
Gitblit v1.9.1