From b9b55bd345d96ab9b500dd47489393d03f776358 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期五, 31 十月 2025 10:22:36 +0800
Subject: [PATCH] Merge branch 'devlop_whxrwms' of http://47.97.1.152:5880/r/wms-master into devlop_whxrwms
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java | 9 ++++++++-
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java | 3 ---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 16 ++++++++--------
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java | 9 ++++++++-
rsf-server/src/main/resources/application.yml | 2 +-
8 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
index abb02fc..2a4f608 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
@@ -1,7 +1,4 @@
package com.vincent.rsf.openApi.controller;
-
-
-import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
import com.vincent.rsf.openApi.entity.params.ErpMatnrParms;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
index 298e948..8433f0a 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
@@ -69,7 +69,14 @@
if (result.getCode() == 200) {
JSONObject object = JSONObject.parseObject(JSONObject.toJSONString(result.getData()));
OrderDto dto = new OrderDto();
- dto.setOrderNo(object.getString("code")).setAnfme(object.getDouble("anfme")).setType(object.getString("type")).setWkType(object.getString("wkType")).setQty(object.getDouble("qty")).setPoCode(object.getString("poCode")).setExceStatus(object.getShort("exceStatus")).setWorkQty(object.getDouble("workQty"));
+ dto.setOrderNo(object.getString("code"))
+ .setAnfme(object.getDouble("anfme"))
+ .setType(object.getString("type"))
+ .setWkType(object.getString("wkType"))
+ .setQty(object.getDouble("qty"))
+ .setPoCode(object.getString("poCode"))
+ .setExceStatus(object.getShort("exceStatus"))
+ .setWorkQty(object.getDouble("workQty"));
result.setData(dto);
return result;
} else {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
index 5774b2d..516077e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReportMsgController.java
@@ -43,7 +43,7 @@
return R.error("涓婃姤鏄庣粏涓嶈兘涓虹┖锛侊紒");
}
- return reportMsgService.reportOrders(params);
+ return reportMsgService.uploadReportOrders(params);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java
index 8fddacf..bf51a67 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/ReportMsgService.java
@@ -17,5 +17,5 @@
boolean reportInspectNotify(List<PoItemsDto> items);
- R reportOrders(ReportParams params);
+ R uploadReportOrders(ReportParams params);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 21cd108..63fc48e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -225,8 +225,7 @@
@Override
public R queryOrderStatus(QueryOrderParam queryParams) {
WkOrder wkOrders = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getCode, queryParams.getOrderNo())
- .eq(StringUtils.isNotBlank(queryParams.getType()), WkOrder::getType, queryParams.getType()));
+ .eq(WkOrder::getPoCode, queryParams.getOrderNo()));
if (Objects.isNull(wkOrders)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
@@ -761,17 +760,18 @@
}
Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, baseMatParms.getMatnr()));
if (Objects.isNull(matnr)) {
- BeanUtils.copyProperties(baseMatParms, matnr);
- matnr.setCode(baseMatParms.getMatnr());
- matnr.setName(baseMatParms.getMaktx());
+ Matnr matnr1 = new Matnr();
+ BeanUtils.copyProperties(baseMatParms, matnr1);
+ matnr1.setCode(baseMatParms.getMatnr());
+ matnr1.setName(baseMatParms.getMaktx());
if (!Objects.isNull(baseMatParms.getGroupName())) {
MatnrGroup matnrGroup = matnrGroupService.getOne(new LambdaQueryWrapper<MatnrGroup>()
.eq(MatnrGroup::getName, baseMatParms.getGroupName()));
- if (Objects.isNull(matnrGroup)) {
- matnr.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
+ if (!Objects.isNull(matnrGroup)) {
+ matnr1.setGroupCode(matnrGroup.getCode()).setGroupId(matnrGroup.getId());
}
}
- if (!matnrService.save(matnr)) {
+ if (!matnrService.save(matnr1)) {
throw new CoolException("鐗╂枡鏂板澶辫触锛侊紒");
}
} else {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
index 6552326..f5f48d9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -183,7 +183,7 @@
* @return com.vincent.rsf.framework.common.R
*/
@Override
- public R reportOrders(ReportParams params) {
+ public R uploadReportOrders(ReportParams params) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
index 29496a6..a83445d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java
@@ -183,13 +183,20 @@
});
params.setData(reportData);
- R reported = reportMsgService.reportOrders(params);
+ R reported = reportMsgService.uploadReportOrders(params);
if (reported.get("code").equals(200)) {
order.setNtyStatus(1);
if (!asnOrderService.updateById(order)) {
throw new CoolException("涓婃姤鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
+ try {
+ //浼戠湢3绉�
+ Thread.sleep(3000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+
});
}
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index 0c99aef..b5db333 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -25,7 +25,7 @@
# global-config:
# field-strategy: 0
configuration:
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
call-setters-on-nulls: true
--
Gitblit v1.9.1