From 2574fd82e5f1278d1408a59af723ce46468b87ed Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期五, 27 十月 2023 14:32:29 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java | 10 ---------- src/main/webapp/static/js/wrkMast/wrkMast.js | 1 + src/main/resources/application.yml | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java index f7a36fe..14f6ca0 100644 --- a/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/MoveLocHandler.java @@ -78,16 +78,6 @@ ); if (!Cools.isEmpty(testMast)){ if (testMast.getStatus()==4){ - boolean signCrn1 = basCrnpService.checkSiteError(1, false); - if (!signCrn1){ - log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->1鍙峰爢鍨涙満涓嶅彲鍑哄簱!"); - break; - } - boolean signCrn2 = basCrnpService.checkSiteError(2, true); - if (!signCrn2){ - log.error("娴嬭瘯瀹屾垚鑷姩绉诲簱--->2鍙峰爢鍨涙満涓嶅彲鐢�!"); - break; - } //绉诲簱寮�濮嬶紝鏌ヨ鐩爣搴撲綅 LocMast targetLocNo = locMastService.queryFreeLocMast(2,(short)4); if (Cools.isEmpty(targetLocNo)){ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d18df20..c32453d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -12,6 +12,7 @@ enabled: false datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs username: sa password: sa@123 diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js index 409d2f6..de1e9c0 100644 --- a/src/main/webapp/static/js/wrkMast/wrkMast.js +++ b/src/main/webapp/static/js/wrkMast/wrkMast.js @@ -31,6 +31,7 @@ ,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'} ,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'} ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'} + ,{field: 'mk', align: 'center',title: '鍚姩鎸夐挳'} ,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true} ,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true} // ,{field: 'picking', align: 'center',title: '鎷f枡', templet:function(row){ -- Gitblit v1.9.1