From cfaa0a74bf5a5f87c172f867f2a7371298f4c241 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 10 九月 2021 14:27:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/erp/ErpService.java | 2 ++
src/main/webapp/views/locMatStatus/locMatStatus.html | 13 ++++++++-----
src/main/webapp/views/pakStore/matStatus.html | 1 +
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 2 ++
src/main/java/com/zy/common/service/erp/ErpSqlServer.java | 4 ++++
src/main/resources/application.yml | 2 +-
6 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index dddcf8d..8fff449 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -4,6 +4,7 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WorkLogHandler;
+import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,7 @@
for (WrkMast wrkMast : wrkMasts) {
ReturnT<String> result = workLogHandler.start(wrkMast);
if (!result.isSuccess()) {
+ log.error(result.getMsg());
log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
}
}
diff --git a/src/main/java/com/zy/common/service/erp/ErpService.java b/src/main/java/com/zy/common/service/erp/ErpService.java
index de28db0..142d9d0 100644
--- a/src/main/java/com/zy/common/service/erp/ErpService.java
+++ b/src/main/java/com/zy/common/service/erp/ErpService.java
@@ -113,6 +113,7 @@
"and isb.FBillNo= ''{2}''";
sql = MessageFormat.format(sql, increment, Fnumber, FBillNo);
if (erpSqlServer.update(sql) > 0) {
+// log.error("鏇存柊ERP涓棿琛ㄦ垚鍔�===>>[FBillNo:{},Fnumber:{},increment:{}]",FBillNo,Fnumber,increment);
List<InStockBillEntry> inStockBillEntries = getInStockBillEntry(FBillNo);
boolean complete = true;
// 姣旇緝鍗曠瑪璧勬枡鐗╂枡鏄惁鍏ㄩ儴瀹屾垚
@@ -137,6 +138,7 @@
}
return true;
} else {
+ log.error("鏇存柊ERP涓棿琛ㄥけ璐�===>>[FBillNo:{},Fnumber:{},increment:{}]",FBillNo,Fnumber,increment);
return false;
}
}
diff --git a/src/main/java/com/zy/common/service/erp/ErpSqlServer.java b/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
index f419226..2cf48c9 100644
--- a/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
+++ b/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
@@ -2,6 +2,7 @@
import com.core.common.Cools;
import com.zy.common.properties.ErpDbProperties;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -19,6 +20,7 @@
* 绠�鍗曟寔涔呭眰妗嗘灦
* Created by vincent on 2020/11/26
*/
+@Slf4j
@Service
public class ErpSqlServer {
@@ -88,6 +90,8 @@
return pstm.executeUpdate();
} catch (Exception e) {
e.printStackTrace();
+ log.error("鏇存柊ERP涓棿琛ㄥけ璐�===>>" + sql);
+ log.error("鏇存柊ERP涓棿琛ㄥけ璐�===>>" + e);
return 0;
} finally {
release();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f94f1a1..8b97c13 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=xtyasrs
+ url: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/views/locMatStatus/locMatStatus.html b/src/main/webapp/views/locMatStatus/locMatStatus.html
index 74074af..2cc36ca 100644
--- a/src/main/webapp/views/locMatStatus/locMatStatus.html
+++ b/src/main/webapp/views/locMatStatus/locMatStatus.html
@@ -30,13 +30,14 @@
<option value="0">寰呮</option>
<option value="1">鑹搧</option>
<option value="2">涓嶈壇鍝�</option>
+ <option value="3">鐭</option>
</select>
</div>
- <!--<div class="layui-inline">-->
- <!--<div class="layui-input-inline">-->
- <!--<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">-->
- <!--</div>-->
- <!--</div>-->
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="mnemonic" placeholder="鐢熶骇鍗曞彿" autocomplete="off">
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -59,6 +60,8 @@
<span style="color: green">鑹搧</span>
{{# } else if(d.matStatus === '2'){ }}
<span style="color: red">涓嶈壇鍝�</span>
+ {{# } else if(d.matStatus === '3'){ }}
+ <span style="color: blue">鐭</span>
{{# } else { }}
{{# } }}
</script>
diff --git a/src/main/webapp/views/pakStore/matStatus.html b/src/main/webapp/views/pakStore/matStatus.html
index c8dac91..0ba2b9e 100644
--- a/src/main/webapp/views/pakStore/matStatus.html
+++ b/src/main/webapp/views/pakStore/matStatus.html
@@ -13,6 +13,7 @@
<select class="cool-auto-complete-window-select" id="matStatusChoose" lay-filter="matStatusChoose" style="width: 250px; height: 30px">
<option value="1">鑹搧</option>
<option value="2">涓嶈壇鍝�</option>
+ <option value="3">鐭</option>
</select>
</form>
--
Gitblit v1.9.1