From 230b5f1b455ce5d89ada908fcf79ca8d18eb0e1d Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 25 十一月 2025 18:33:33 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/order/order.js | 4 ++++
src/main/java/com/zy/asrs/task/ArmRulesScheduler.java | 2 +-
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 2 +-
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 1 -
src/main/webapp/views/order/order.html | 23 +++++++++++++++--------
5 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/ArmRulesScheduler.java b/src/main/java/com/zy/asrs/task/ArmRulesScheduler.java
index c10c764..52cef5b 100644
--- a/src/main/java/com/zy/asrs/task/ArmRulesScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ArmRulesScheduler.java
@@ -29,7 +29,7 @@
@Autowired
private ArmRulesHandler armRulesHandler;
- @Scheduled(cron = "0 0 * * * ? ")
+ @Scheduled(cron = "0/30 * * * * ? ")
private void execute(){
List<BasArmRules> basArmRules = basArmRulesService.AllStatusSatisfyBasArmRules(0);
if (basArmRules.isEmpty()) {
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index c424ecf..3af4c8f 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -130,7 +130,6 @@
case "PUR_RECEIVEBIll": //宸插鏍告敹鏂欏崟鏌ヨ
// jsonObject.put("start_biztime", latestUpdateTime);//涓氬姟璧峰鏃ユ湡
jsonObject.put("start_biztime", "2025-01-01 00:00:00");//涓氬姟璧峰鏃ユ湡
-
jsonObject.put("end_biztime", sdf1.format(now));//涓氬姟缁撴潫鏃ユ湡
jsonObject.put("billno", Arrays.asList("CGSL-251023-000027","CGSL-250811-000028"));
jsonObject.put("billstatus", Arrays.asList("C"));//鏁版嵁鐘舵�� [A:鏆傚瓨, B:宸叉彁浜�, C:宸插鏍竇
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
index 51e0322..1f2a6f4 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -3,7 +3,7 @@
public enum KingDeeUtilType {
BD_MATERIAL(0, "鐗╂枡妗ｆ","BD_MATERIAL","","","",1),
BD_RRGANIZATION(2, "渚涘簲鍟�","BD_RRGANIZATION","","","",1),
- PUR_RECEIVEBIll(3, "鏀舵枡鍗�","PUR_RECEIVEBIll","","","",1),
+// PUR_RECEIVEBIll(3, "鏀舵枡鍗�","PUR_RECEIVEBIll","","","",1),
// STK_InStock(1, "閲囪喘鍏ュ簱鍗�","STK_InStock","FRealQty","","",1),
// PUR_MRB(2, "閲囪喘閫�鏂欏崟","PUR_MRB","FRMREALQTY","","",1),
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index fc4197d..c82bb3e 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -246,6 +246,10 @@
// {field: 'specs', title: '瑙勬牸'},
{field: 'standby1', title: 'po'},
{field: 'standby2', title: 'upc'},
+ {field: 'standby3', title: '瀹㈡埛SKU'},
+ {field: 'boxType1', title: '璐т富鍚嶇О'},
+ {field: 'boxType2', title: 'upc'},
+ {field: 'boxType3', title: '瀹㈡埛SKU'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index df74b30..b1ea35c 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -173,16 +173,23 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label">璐т富锛�</label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="owner" placeholder="杈撳叆璐т富鍚嶇О" style="display: none">
- <input id="owner$" name="owner$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ揣涓诲悕绉�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="locOwnerQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="locOwnerQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
+ <div class="layui-input-block">
+ <input id="owner" name="owner" placeholder="杈撳叆璐т富" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
+ <!-- lay-verify="required"-->
</div>
</div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">璐т富锛�</label>-->
+<!-- <div class="layui-input-block cool-auto-complete">-->
+<!-- <input class="layui-input" name="owner" placeholder="杈撳叆璐т富鍚嶇О" style="display: none">-->
+<!-- <input id="owner$" name="owner$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ揣涓诲悕绉�" onfocus=this.blur() lay-verType="tips" lay-verify="required">-->
+<!-- <div class="cool-auto-complete-window">-->
+<!-- <input class="cool-auto-complete-window-input" data-key="locOwnerQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">-->
+<!-- <select class="cool-auto-complete-window-select" data-key="locOwnerQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item" style="position: relative;">
<label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label>
<div class="layui-input-block">
--
Gitblit v1.9.1