From e400c6f84ad6e777ae32597d01eb2d0fd79f5e56 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 21 十一月 2024 15:58:17 +0800
Subject: [PATCH] 完善
---
zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
index b43c6ad..8da98f7 100644
--- a/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
+++ b/zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java
@@ -8,6 +8,9 @@
import com.zy.asrs.common.openapi.entity.param.*;
import com.zy.asrs.common.openapi.service.ApiService;
import com.zy.asrs.common.openapi.service.HostKeyService;
+import com.zy.asrs.common.sys.entity.OperateLog;
+import com.zy.asrs.common.sys.service.OperateLogService;
+import com.zy.asrs.common.utils.Utils;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.common.wms.entity.DocType;
import com.zy.asrs.common.wms.entity.OrderSettle;
@@ -15,6 +18,7 @@
import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.openapi.param.MatParam;
import com.zy.asrs.openapi.param.OrderParam;
@@ -24,6 +28,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -172,6 +177,19 @@
// System.out.println(map.toString());
log.info("order/execute/auth/v1锛�" + JSON.toJSONString(map));
OrderParam orderParam = JSON.parseObject(JSON.toJSONString(map), OrderParam.class);
+
+ OperateLogService operateLogService = SpringUtils.getBean(OperateLogService.class);
+ //璁板綍涓婃姤鏁版嵁
+ OperateLog operateLog = new OperateLog();
+ operateLog.setAction("ERP鎺ㄩ�佽鍗�");
+ operateLog.setRequest(orderParam.toString());
+ operateLog.setResponse("");
+ operateLog.setCreateTime(new Date());
+ operateLog.setSystem("WMS");
+ operateLog.setUserId(9527L);
+ operateLog.setIp("127.0.0.1");
+ operateLogService.save(operateLog);
+
List<DocType> list = apiService.getOrderType();
DocType type = null;
for (DocType docType : list) {
@@ -198,13 +216,18 @@
if(Cools.isEmpty(mats)){
mats.add(mat);
}else{
+ boolean boo=true;
for (GenerateOrderMatParam m:mats
) {
if(m.getMatnr().equals(matParam.getMatnr())){
- return R.error("鍚屼竴璁㈠崟涓嶅厑璁告湁鐩稿悓鐗╂枡");
+ m.setAnfme(m.getAnfme()+mat.getAnfme());
+ boo=false;
+ break;
}
}
- mats.add(mat);
+ if(boo){
+ mats.add(mat);
+ }
}
}
--
Gitblit v1.9.1