From a672a436711f512c05ee100700d863a654a7c69d Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期五, 10 五月 2024 15:38:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 4 ++++
src/main/webapp/views/agvWrkMast/wrkMast.html | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 5abd58d..2c4adc0 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -407,6 +407,7 @@
adjDetl.setBatch(locDetl.getBatch());
adjDetl.setOriQty(locDetl.getAnfme());
adjDetl.setAdjQty(adjust.getCount());
+ adjDetl.setMemo(locDetl.getSuppCode());
adjDetl.setModiTime(now);
adjDetl.setModiUser(userId);
adjDetl.setAppeTime(now);
@@ -603,6 +604,9 @@
if (Cools.isEmpty(agvWrkMast)){
throw new CoolException(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
}
+ if (agvWrkMast.getIoType() == 1 || agvWrkMast.getIoType() == 53){
+ throw new CoolException(workNo+"鍏ュ簱浠诲姟鏃犳硶杞嚭搴�");
+ }
agvWrkMast.setIoType(101);
agvWrkMast.setWrkSts(206L);
diff --git a/src/main/webapp/views/agvWrkMast/wrkMast.html b/src/main/webapp/views/agvWrkMast/wrkMast.html
index 6e3ee3f..931bcce 100644
--- a/src/main/webapp/views/agvWrkMast/wrkMast.html
+++ b/src/main/webapp/views/agvWrkMast/wrkMast.html
@@ -122,7 +122,7 @@
<a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">鏄庣粏</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">瀹屾垚</a>
<a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">鍙栨秷</a>
- <a class="layui-btn layui-btn-warm layui-btn-xs btn-out" lay-event="changeToOut">杞嚭搴�</a>
+<!-- <a class="layui-btn layui-btn-warm layui-btn-xs btn-out" lay-event="changeToOut">杞嚭搴�</a>-->
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">缁存姢鐘舵��</a>
{{#if (d.steNo) { }}
<a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="removeSte">寮冭溅</a>
--
Gitblit v1.9.1