From 8570b32ed879dbe625b58d31c6ed04288cd9d476 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 16 十二月 2025 08:24:56 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java | 67 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
index 42f2316..6e881a9 100644
--- a/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java
@@ -6,6 +6,9 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.api.entity.OrderParams;
+import com.zy.api.entity.ReportOrderParam;
+import com.zy.api.entity.PubOrderParams;
+import com.zy.api.entity.ReportOrderParam;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.enums.MatLocType;
import com.zy.api.enums.MatType;
@@ -22,11 +25,15 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.utils.Utils;
+import com.zy.common.utils.HttpHandler;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Objects;
@@ -49,12 +56,47 @@
* @return com.core.common.R
*/
@Override
- public R receiveOrders(OrderParams params) {
+ public R receiveOrders(PubOrderParams params) {
if (params.getType().equals(OrderWkType.getTypeVal(params.getType()))) {
return R.error("褰撳墠绫诲瀷涓嶆槸涓婃灦娲惧伐鍗曪紒锛�");
}
addOrUpdateOrders(params, "add");
return R.ok("鍗曟嵁涓嬪彂鎴愬姛锛侊紒");
+ }
+
+ /**
+ * 涓婃灦娲惧伐鍗曞弽棣�
+ * @author Ryan
+ * @date 2025/11/24 15:33
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R getInDispatchResult(ReportOrderParam params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ String response = null;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri("127.0.0.1:8081")
+ .setPath("/wms/order/getInDispatchResult")
+ .setJson(JSONObject.toJSONString(params))
+ .build()
+ .doPost();
+ if (Objects.isNull(response) || response.trim().isEmpty()) {
+ return R.error("澶栫綉鎺ュ彛鏃犲搷搴旓紒锛�");
+ }
+ JSONObject jsonObject = JSONObject.parseObject(response);
+ Integer code = jsonObject.getInteger("code");
+ if (!Objects.isNull(code) && code.equals(1)) {
+ return R.ok("鍏ュ簱鍗曚笂鎶ュ畬鎴愶紒锛�");
+ } else {
+ String msg = jsonObject.getString("message");
+ return R.error(Objects.isNull(msg) ? "涓婃姤澶辫触锛侊紒" : msg);
+ }
+ } catch (Exception e) {
+ return R.error(e.getMessage());
+ }
}
/**
@@ -67,7 +109,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R basMatupdate(SyncMatParmas params) {
+ public synchronized R basMatupdate(SyncMatParmas params) {
if (Objects.isNull(params.getPro_komcode())) {
return R.error("闆朵欢缂栫爜涓嶈兘涓虹┖锛侊紒");
}
@@ -75,27 +117,30 @@
if (!Objects.isNull(matnr)) {
// 璁㈠崟鏃堕棿
if (Utils.isValidFormat(params.getUpdate_time(), "yyyy-MM-dd HH:mm:ss")) {
- Date date = DateUtils.convert(params.getUpdate_time(), "yyyy-MM-dd HH:mm:ss");
- matnr.setUpdateTime(date);
+ Date date1 = Utils.getFormateDate(params.getUpdate_time());
+ matnr.setUpdateTime(date1);
}
matnr.setMaktx(params.getPro_name());
- matnr.setVolume(Double.parseDouble(params.getPro_size()));
+ matnr.setSpecs(params.getPro_size());
matnr.setWeight(Double.parseDouble(params.getPro_wet()));
matnr.setSuppCode(params.getPro_id());
matnr.setTagId(MatLocType.getTag(params.getPro_type()));
matnr.setManu(params.getCompany_id());
if (!matService.updateById(matnr)) {
- throw new CoolException("鐗╂枡鏇存柊澶辫触锛侊紒");
+ throw new CoolException("鐗╂枡鏇存柊澶辫触鎴栨棤闇�鏇存柊锛侊紒");
}
} else {
+ if (Objects.isNull(matnr)) {
+ matnr = new Mat();
+ }
// 璁㈠崟鏃堕棿
if (Utils.isValidFormat(params.getUpdate_time(), "yyyy-MM-dd HH:mm:ss")) {
- Date date = DateUtils.convert(params.getUpdate_time(), "yyyy-MM-dd HH:mm:ss");
- matnr.setUpdateTime(date);
+ Date date1 = Utils.getFormateDate(params.getUpdate_time());
+ matnr.setUpdateTime(date1);
}
matnr.setMaktx(params.getPro_name());
matnr.setMatnr(params.getPro_komcode());
- matnr.setVolume(Double.parseDouble(params.getPro_size()));
+ matnr.setSpecs(params.getPro_size());
matnr.setWeight(Double.parseDouble(params.getPro_wet()));
matnr.setSuppCode(params.getPro_id());
matnr.setTagId(MatLocType.getTag(params.getPro_type()));
@@ -115,7 +160,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void addOrUpdateOrders(OrderParams params, String type) {
+ public void addOrUpdateOrders(PubOrderParams params, String type) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -155,7 +200,7 @@
* @param params
*/
@Transactional(rollbackFor = Exception.class)
- public void generateOrders(OrderParams params) {
+ public void generateOrders(PubOrderParams params) {
// 灏嗘暟鎹綋鏂拌鍗曟彃鍏�
Order newOrder = new Order();
if (OrderType.ORDER_IN.type.equals(OrderWkType.getTypeVal(params.getType()))) {
--
Gitblit v1.9.1