From 340b69790a7a2eff1ff5de75f109dc77f4b4008f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 十一月 2024 16:12:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java | 3 ++-
src/main/java/com/zy/asrs/entity/LocDetl.java | 7 +++++++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 14 ++++++++------
src/main/resources/mapper/LocDetlMapper.xml | 16 ++++++++--------
src/main/resources/application.yml | 4 ++--
5 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 2eb2138..40cfd0a 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -289,6 +289,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public void setOwner(Integer owner) {
+ if (Cools.isEmpty(owner) || owner == 0){
+ this.owner = 32;
+ }
+ this.owner = owner;
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 9465115..be59bb9 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -188,12 +188,14 @@
manPakOutEntityWrapper.eq("doc_num",wrkDetl.getOrderNo());
manPakOutEntityWrapper.eq("matnr",wrkDetl.getMatnr());
ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper);
- if (manPakOut.getCount() + wrkDetl.getAnfme() >= manPakOut.getAnfme()){
- manPakOut.setStatus(1);
- }
- manPakOut.setCount(manPakOut.getCount() + wrkDetl.getAnfme());
- if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
- return FAIL.setMsg("鏇存柊鎷ｈ揣鍗曞畬鎴愭暟閲忓け璐�");
+ if (!Cools.isEmpty(manPakOut)){
+ if (manPakOut.getCount() + wrkDetl.getAnfme() >= manPakOut.getAnfme()){
+ manPakOut.setStatus(1);
+ }
+ manPakOut.setCount(manPakOut.getCount() + wrkDetl.getAnfme());
+ if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
+ return FAIL.setMsg("鏇存柊鎷ｈ揣鍗曞畬鎴愭暟閲忓け璐�");
+ }
}
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java
index 8b7be90..e82fdd4 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java
@@ -4,6 +4,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@Slf4j
@@ -15,7 +16,7 @@
@Value("${erp.switch.LoginAuthenticationSwitch}")
private boolean LoginAuthenticationSwitch;
- //@Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
void login(){
if(!LoginAuthenticationSwitch){
return;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a4f6c33..5ef1ed2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -75,7 +75,7 @@
PushDowmOrderSwitch: true
# 鍦板潃
address:
- URL: http://lubemater.ik3cloud.com/k3cloud/html5/
+ URL: http://lubemater.ik3cloud.com/
#鐧诲綍鍦板潃
loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc
#鍗曟嵁锛屽晢鍝佹。妗堝湴鍧�
@@ -95,4 +95,4 @@
password: "a.222222"
lcid: 2052
# 淇濇寔true
- enable: false
\ No newline at end of file
+ enable: true
\ No newline at end of file
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index f20e07e..93fbee4 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -652,14 +652,14 @@
and b.loc_sts = 'F'
and a.matnr = #{matnr}
- <!-- <choose>-->
- <!-- <when test="batch != null and batch != ''">-->
- <!-- and a.batch = #{batch}-->
- <!-- </when>-->
- <!-- <otherwise>-->
- <!-- and (a.batch IS NULL OR a.batch = '')-->
- <!-- </otherwise>-->
- <!-- </choose>-->
+ <choose>
+ <when test="batch != null and batch != ''">
+ and a.batch = #{batch}
+ </when>
+ <otherwise>
+ and (a.batch IS NULL OR a.batch = '')
+ </otherwise>
+ </choose>
<choose>
<when test="owner != null and owner !=0">
--
Gitblit v1.9.1