From 2850a38318fdbd236c096a43fb8c11351b4f6c43 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 27 三月 2023 14:15:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 80 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 50f219f..f689107 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,10 +4,7 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.entity.param.PackParam;
+import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -146,6 +143,81 @@
return R.ok().add(openService.queryStock());
}
+ /**
+ * 鍟嗗搧淇℃伅鍚屾鎺ュ彛
+ */
+ @PostMapping("/mat/v1")
+ public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ MatSyncParam matSyncParam = openService.syncMat(param);
+ if (Cools.isEmpty(matSyncParam.getMats()) || matSyncParam.getMats().size() <=0 ) {
+ return R.error("鏁版嵁寮傚父");
+ }
+ StringBuilder Msg= new StringBuilder("鍘熷洜锛�");
+ int MsgT=0,MsgF=0;
+ for (MatSyncParam.Mats matParam:matSyncParam.getMats()){
+ if (matParam.isType()){
+ MsgT++;
+ }else {
+ MsgF++;
+ Msg.append(matParam.getMatnr()).append(":").append(matParam.getMemo()).append(";");
+ }
+ }
+ if (MsgF==0){
+ return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�");
+ }else if (MsgT==0){
+ return R.ok("鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
+ }else {
+ return R.ok("鎴愬姛鎺ユ敹鐗╂枡锛�"+MsgT+"涓�;"+"鎺ユ敹鐗╂枡澶辫触锛�"+MsgF+"涓�;"+Msg);
+ }
+
+ }
+
+ /**
+ * 鍏ュ簱閫氱煡妗ｇ敓鎴�
+ */
+ @PostMapping("/comb/v1")
+ public synchronized R combMES(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) CombParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.combMes(param);
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
+ /**
+ * 鍏ュ簱璁板綍鑾峰彇
+ */
+ @PostMapping("/inlog/v1")
+ public synchronized R inlogERP(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request){
+ auth(appkey,null, request);
+ if (Cools.isEmpty()) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return R.ok().add(openService.inlogERP());
+ }
+ /**
+ * 鍑哄簱璁板綍鑾峰彇
+ */
+ @PostMapping("/outlog/v1")
+ public synchronized R outlogERP(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request){
+ auth(appkey,null, request);
+ if (Cools.isEmpty()) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return R.ok().add(openService.outlogERP());
+ }
+
private void auth(String appkey, Object obj, HttpServletRequest request) {
log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
--
Gitblit v1.9.1