From 277ce0556ebe4bd91af10f3e4e8b69bab78947d7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 十一月 2024 12:11:01 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocDetlMapper.xml | 80 ++++++++++++++++++++--------------------
src/main/java/com/zy/asrs/controller/OutController.java | 4 +-
src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java | 4 +-
src/main/webapp/views/order/order.html | 1
4 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 910d56b..98497a0 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -80,9 +80,9 @@
List<LocDetl> locDetls = new ArrayList<>();
if (decimal.doubleValue() > 0){
- locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
+ locDetls = locDetlService.queryStock2(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner() == 32? 0 : orderDetl.getOwner());
}else {
- locDetls = locDetlService.queryStock3(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner());
+ locDetls = locDetlService.queryStock3(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOwner() == 32? 0 : orderDetl.getOwner());
}
for (LocDetl locDetl : locDetls) {
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
index dc0bc36..95b6e28 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
@@ -60,9 +60,9 @@
String[] split = orderNo.split("-");
String orderNoS = split[0];
//鐧诲綍閲戣澏r
- log.info("鐧诲綍閲戣澏");
+// log.info("鐧诲綍閲戣澏");
ReturnT<String> start = loginAuthenticationHandler.start();
- log.info("鐧诲綍閲戣澏:start:"+start);
+// log.info("鐧诲綍閲戣澏:start:"+start);
DocType docType = docTypeService.selectById(order.getDocType());
if (null == docType) {
return SUCCESS;
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 93fbee4..900ece5 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -148,14 +148,14 @@
left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no
where 1=1
and b.loc_sts = 'F'
- <choose>
- <when test="owner != null and owner != 0">
- and owner = #{owner}
- </when>
- <otherwise>
- and 1!=1
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="owner != null and owner != 0">-->
+<!-- and owner = #{owner}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and 1!=1-->
+<!-- </otherwise>-->
+<!-- </choose>-->
<!-- <choose>-->
<!-- <when test="payment != null and payment != 0">-->
<!-- and payment = #{payment}-->
@@ -175,14 +175,14 @@
left join asr_loc_mast_man_node_merge b on a.loc_no = b.loc_no
where 1=1
and b.loc_sts = 'F'
- <choose>
- <when test="owner != null and owner != 0">
- and owner = #{owner}
- </when>
- <otherwise>
- and 1!=1
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="owner != null and owner != 0">-->
+<!-- and owner = #{owner}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and 1!=1-->
+<!-- </otherwise>-->
+<!-- </choose>-->
<!-- <choose>-->
<!-- <when test="payment != null and payment != 0">-->
<!-- and payment = #{payment}-->
@@ -278,14 +278,14 @@
<!-- </otherwise>-->
<!-- </choose>-->
- <choose>
- <when test="owner != null and owner !=0">
- and a.owner = #{owner}
- </when>
- <otherwise>
- and 1!=1
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="owner != null and owner !=0">-->
+<!-- and a.owner = #{owner}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and 1!=1-->
+<!-- </otherwise>-->
+<!-- </choose>-->
order by
DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
@@ -448,14 +448,14 @@
<!-- </otherwise>-->
<!-- </choose>-->
- <choose>
- <when test="owner != null and owner !=0">
- and a.owner = #{owner}
- </when>
- <otherwise>
- and 1!=1
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="owner != null and owner !=0">-->
+<!-- and a.owner = #{owner}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and 1!=1-->
+<!-- </otherwise>-->
+<!-- </choose>-->
order by
a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
@@ -661,14 +661,14 @@
</otherwise>
</choose>
- <choose>
- <when test="owner != null and owner !=0">
- and a.owner = #{owner}
- </when>
- <otherwise>
- and 1!=1
- </otherwise>
- </choose>
+<!-- <choose>-->
+<!-- <when test="owner != null and owner !=0">-->
+<!-- and a.owner = #{owner}-->
+<!-- </when>-->
+<!-- <otherwise>-->
+<!-- and 1!=1-->
+<!-- </otherwise>-->
+<!-- </choose>-->
order by
a.manu,DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 9a67ea5..f0181c8 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -62,6 +62,7 @@
<option value="2">浣滀笟涓�</option>
<option value="4">宸插畬鎴�</option>
<option value="6">涓婃姤瀹屾垚</option>
+ <option value="7">涓婃姤澶辫触</option>
</select>
</div>
</div>
--
Gitblit v1.9.1