From 7277731f83b359443bb8259ce568c8bcf37ac31d Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期五, 13 十二月 2024 16:19:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 1 +
src/main/java/com/zy/common/web/WcsController.java | 4 ++++
src/main/resources/application.yml | 2 +-
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 3ee5f5f..ecc99d3 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -616,6 +616,7 @@
orderDetl.setCreateTime(now);
orderDetl.setUpdateBy(userId);
orderDetl.setUpdateTime(now);
+ orderDetl.setSource(30);
orderDetl.setStatus(1);
orderDetl.setBomCode(bomNum);
orderDetl.setThreeCode(threeCode);
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 508da72..d7516d7 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -177,6 +177,10 @@
}
String fullPlt = "N";
for (WaitPakin waitPakin : waitPakins) {
+ if (Cools.isEmpty(waitPakin.getIsFull())) {
+ fullPlt = "N";
+ break;
+ }
if (waitPakin.getIsFull().equals("Y")) {
fullPlt = "Y";
break;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5f3d9e9..3f270b7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=phpsasrs
+ url: jdbc:sqlserver://10.10.10.233:1433;databasename=phpsasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1