From 1c502c82c188292fd8c9337c221e1f09a86a642b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 15 八月 2025 13:34:03 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
index e38d229..8786bd7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/ReceiveMsgController.java
@@ -5,12 +5,15 @@
import com.vincent.rsf.server.api.controller.params.OrderParams;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
import com.vincent.rsf.server.manager.entity.excel.MatnrsTemplate;
+import com.vincent.rsf.server.manager.service.MatnrGroupService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -21,6 +24,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* @author Ryan
@@ -38,6 +42,7 @@
private ReceiveMsgService receiveMsgService;
@Autowired
private MatnrService matnrService;
+
/**
* @author Ryan
@@ -72,7 +77,7 @@
AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
List<AsnOrderTemplate> list = new ArrayList<>();
list.add(template);
- ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class), response);
+ ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class), response);
System.out.println(template);
// return R.ok();
}
@@ -80,8 +85,13 @@
@ApiOperation("鍩虹鐗╂枡淇℃伅鍚屾")
@PostMapping("/sync/base/matnrs")
public R syncMatnrs(@RequestBody List<BaseMatParms> matnrs) {
-
+ if (Objects.isNull(matnrs)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛�1");
+ }
+ receiveMsgService.syncMatnrs(matnrs);
return R.ok();
}
+ public R syc
+
}
--
Gitblit v1.9.1