From f873c89d87eb16ee83c0058d9a841a97d8e2bf14 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 七月 2024 18:12:11 +0800
Subject: [PATCH] gwcs请求入库参数修改
---
src/main/resources/mapper/OrderMapper.xml | 18 ++++++++++++------
src/main/java/com/zy/asrs/task/GhjtScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/handler/GhjtHandler.java | 9 +++++++--
src/main/java/com/zy/common/model/DetlDto.java | 2 ++
src/main/java/com/zy/asrs/entity/param/ZwmsOutLocWorkDto.java | 1 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 3 ++-
6 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/ZwmsOutLocWorkDto.java b/src/main/java/com/zy/asrs/entity/param/ZwmsOutLocWorkDto.java
index 659eb1f..1a96432 100644
--- a/src/main/java/com/zy/asrs/entity/param/ZwmsOutLocWorkDto.java
+++ b/src/main/java/com/zy/asrs/entity/param/ZwmsOutLocWorkDto.java
@@ -23,6 +23,7 @@
private String rollNo; // 鍗峰彿
private String boxNo; // 绠卞彿
private String specs; // 瑙勬牸
+ private Integer splices; // 鎺ュご/涓�
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f7a3c6b..1a69600 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1162,6 +1162,7 @@
for (ZwmsOutLocWorkDto.Rolls detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getRollNo(), detail.getBoxNo(), 1.0);
dto.setOrderNo(detail.getSpecs());
+ dto.setSplices(detail.getSplices());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -1178,7 +1179,7 @@
// } else {
// orderDetl.sync(mat);
// }
-
+ orderDetl.setSpecs(String.valueOf(detlDto.getSplices()));
orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
orderDetl.setModel(detlDto.getMatnr());
orderDetl.setMatnr(detlDto.getOrderNo());
diff --git a/src/main/java/com/zy/asrs/task/GhjtScheduler.java b/src/main/java/com/zy/asrs/task/GhjtScheduler.java
index 117f4f2..65209f8 100644
--- a/src/main/java/com/zy/asrs/task/GhjtScheduler.java
+++ b/src/main/java/com/zy/asrs/task/GhjtScheduler.java
@@ -47,7 +47,7 @@
// 鍑哄簱璁㈠崟瀹屾垚鍒欎笂鎶ES
// @Scheduled(cron = "0/4 * * * * ? ")
public void OutBoundCompleteReport() {
- // 鏌ヨ璁㈠崟鐘舵�佷负4.宸插畬鎴�
+ // 鏌ヨ鍑哄簱璁㈠崟鐘舵�佷负4.宸插畬鎴�
List<Order> orders = orderMapper.selectComplete();
for (Order order : orders) {
try {
diff --git a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
index 96c0db8..278e8c1 100644
--- a/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/GhjtHandler.java
@@ -5,6 +5,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.common.constant.MesConstant;
@@ -26,6 +27,9 @@
@Slf4j
@Service
public class GhjtHandler {
+
+ @Resource
+ private OrderMapper orderMapper;
@Autowired
private ApiLogService apiLogService;
@@ -90,8 +94,7 @@
// 鑾峰彇璇锋眰澶�
Map<String, Object> headers = new HashMap<>();
- headers.put("digi-type", "sync ");
- headers.put("digi-protocol", "raw");
+ headers.put("Content-Type", "application/json;charset=UTF-8");
// 鏋勯�犺姹備綋
JSONObject jsonObject = new JSONObject();
@@ -110,6 +113,8 @@
.build()
.doPost();
if (!Cools.isEmpty(response)) {
+ order.setSettle(6L);
+ orderMapper.updateById(order);
success = true;
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL + MesConstant.PAKIN_URL, body, response);
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 650e884..a4ef6a6 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -21,6 +21,8 @@
private Double anfme;
+ private Integer splices;
+
public DetlDto() {
}
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index f704b63..20b4865 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -54,12 +54,18 @@
</update>
<select id="selectComplete" resultMap="BaseResultMap">
- select top 5 *
- from man_order
- where 1=1
- and settle = 4
- and status = 1
- order by create_time asc
+ select
+ top 5 mo.*
+ from
+ man_order mo
+ inner join man_doc_type mt on
+ mo.doc_type = mt.doc_id
+ where
+ mt.pakout = 1
+ and mo.settle = 4
+ and mo.status = 1
+ order by
+ mo.create_time asc
</select>
<insert id="addToLogTable">
--
Gitblit v1.9.1