From 648bc18887322eb7972e638bfe7131aede47799b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 30 十二月 2025 13:15:10 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 8 ++++
src/main/java/com/zy/asrs/service/OrderService.java | 2 +
src/main/java/com/zy/asrs/service/OrderDetlPakinService.java | 2
src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java | 26 +++++++++++-
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 2
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 9 +++-
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 4 ++
src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java | 2
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 3 +
src/main/resources/mapper/OrderDetlPakinMapper.xml | 2
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 4 -
11 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
index ccd144e..5fd7f15 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
@@ -60,5 +60,5 @@
List<OrderDetlPakin> selectOrderDetls(@Param("orderNo")String orderNo,@Param("sku")String sku,@Param("upc") String upc);
List<OrderDetlPakin> selectOrderDetlsByOrderNo(@Param("orderNo")String orderNo);
- boolean morpt(@Param("orderNo")String orderNo);
+ boolean morpt(@Param("orderNo")String orderNo,@Param("matnr")String matnr);
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 6b4144e..e75f2a4 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -30,4 +30,7 @@
List<String> AllStatusSatisfyOrder(@Param("moveStatus") Integer moveStatus);
boolean updateOrderStatus(@Param("orderNo")String orderNo);
+
+ boolean updateOrderStatus4(@Param("orderNo")String orderNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java b/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
index 5fb08f3..6c25523 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
@@ -35,7 +35,7 @@
boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3
, String boxType1, String boxType2, String boxType3, Double qty);
- boolean morpt(String orderNo);
+ boolean morpt(String orderNo,String orderNo1);
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
* @param orderId
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index c023f34..5f613b3 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -42,4 +42,6 @@
boolean updateOrderStatus(String orderNo);
+ boolean updateOrderStatus4(String orderNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
index 0875b3e..5d1f218 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
@@ -4,17 +4,20 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.OrderDetlPakin;
import com.zy.asrs.entity.param.OrderDetlByCode;
import com.zy.asrs.mapper.OrderDetlPakinMapper;
import com.zy.asrs.service.OrderDetlPakinService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
@Service("orderDetlPakinService")
public class OrderDetlPakinServiceImpl extends ServiceImpl<OrderDetlPakinMapper, OrderDetlPakin> implements OrderDetlPakinService {
-
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
@Override
public List<OrderDetlPakin> selectByOrderId(Long orderId) {
return this.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", orderId));
@@ -114,8 +117,25 @@
}
@Override
- public boolean morpt(String orderNo){
- return this.baseMapper.morpt(orderNo);
+ public boolean morpt(String orderNo,String orderNo1){
+ List<OrderDetlPakin> list1 = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_no",orderNo1));
+ try{
+ for (OrderDetlPakin item : list1) {
+ Double anfme = item.getAnfme();
+ Double qty = item.getQty();
+ String matnr = item.getMatnr();
+ if(anfme.equals(qty)){
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectOne(
+ new EntityWrapper<OrderDetlPakin>().eq("matnr", matnr).eq("order_no", orderNo)
+ );
+ this.baseMapper.morpt(orderNo,matnr);
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new CoolException("姹囨姤鍗曡浆鎹㈠け璐�:" + e.getMessage());
+ }
+ return true;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 34e2df6..ec5c640 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -227,5 +227,9 @@
return this.baseMapper.updateOrderStatus(orderNo);
}
+ @Override
+ public boolean updateOrderStatus4(String orderNo){
+ return this.baseMapper.updateOrderStatus4(orderNo);
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
index 5d92c1f..fbd78e6 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -59,7 +59,7 @@
orderService.updateById(order);
}else if(order.getPayType() == 1 || order.getSalesman() != null){
Order order1 = orderService.selectByNo(order.getSalesman());
- if(orderDetlPakinService.morpt(order.getSalesman())){
+ if(orderDetlPakinService.morpt(order.getSalesman(),order.getOrderNo())){
order.setSettle(11L); //yu/cheng/dan/deng/dai/chu/ku/dan
orderService.updateById(order);
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
index 507dddf..7983027 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
@@ -234,9 +234,7 @@
}else{
if(order.getDocType() == 23L){
Order order1 = orderService.selectOne(new EntityWrapper<Order>().eq("salesman",order.getOrderNo()));
- order1.setPayType(null);
- order1.setSettle(4L);
- orderService.updateById(order1);
+ orderService.updateOrderStatus4(order1.getOrderNo());
}
order.setSettle(8L); // 鏇存柊鐘舵�佷负宸蹭笂鎶ュ鏍� 9->8
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
index e87b08a..c979317 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
@@ -273,7 +273,7 @@
.fluentPut("billno", UUID.randomUUID().toString().replace("-", "").substring(0, 16))
.fluentPut("bizorg_number", "BU-00001")
.fluentPut("dept_number", "Org-00002")
- .fluentPut("billstatus", "B")
+ .fluentPut("billstatus", "A")
.fluentPut("customer_number", "Cus-000004")
.fluentPut("biztime", sdf1.format(nowMis))
.fluentPut("biztype_number", "210")
@@ -407,8 +407,13 @@
String billNo = resultItem.getString("number"); // 鑾峰彇杩斿洖鐨勫崟鎹彿
String billId = resultItem.getString("id"); // 鑾峰彇杩斿洖鐨処D
order.setNumber(billId);
- order.setShipCode(add.getString("billno"));
+ String jsonString = add.toJSONString();
+ JSONObject jsonObject = JSONObject.parseObject(jsonString);
+ String billno = jsonObject.getJSONArray("data")
+ .getJSONObject(0)
+ .getString("billno");
+ order.setShipCode(billno); // 璁剧疆鍒� order 瀵硅薄涓�
}
} else {
log.error("鎺ュ彛璋冪敤澶辫触锛屽け璐ョ殑鎿嶄綔鏁伴噺: {}", failCount);
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 1cad3ff..779774f 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -267,7 +267,7 @@
<update id="morpt" parameterType="String">
UPDATE man_order_detl_pakin
SET qty = anfme, work_qty = anfme
- WHERE order_no = #{orderNo}
+ WHERE order_no = #{orderNo} and matnr = #{matnr}
</update>
</mapper>
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index b23e08a..8038400 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -149,4 +149,12 @@
and order_no = #{orderNo}
</update>
+ <update id="updateOrderStatus4">
+ update man_order
+ set pay_type = null,
+ settle = 4
+ where 1=1
+ and order_no = #{orderNo}
+ </update>
+
</mapper>
--
Gitblit v1.9.1