From 69b16c271110dfceb8b38e835dad0fdc0730a90b Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 05 十二月 2023 08:17:58 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/LocSyncController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/LocSyncController.java b/src/main/java/zy/cloud/wms/manager/controller/LocSyncController.java
index 3481873..c0c88c3 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/LocSyncController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/LocSyncController.java
@@ -18,6 +18,8 @@
import zy.cloud.wms.common.model.BillDto;
import zy.cloud.wms.common.service.erp.ErpService;
import zy.cloud.wms.common.web.BaseController;
+import zy.cloud.wms.manager.entity.LocSum;
+import zy.cloud.wms.manager.entity.Pakin;
import zy.cloud.wms.manager.entity.WrkLocSync;
import zy.cloud.wms.manager.service.LocSyncService;
import zy.cloud.wms.manager.service.WrkLocSyncService;
@@ -25,6 +27,9 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+
+import static jdk.nashorn.api.scripting.ScriptUtils.convert;
@RestController
@Slf4j
@@ -118,7 +123,7 @@
res.setMatnr(executeData.getMatnr());
res.setQty(executeData.getQty());
dtos.add(res);
- if (erpService.uploadBill(dtos, docId, docNum)) {
+ if (erpService.uploadBill(dtos, docId, docNum).getSuccess()) {
// 鎴愬姛鍚庡垹闄や换鍔�
if (!wrkLocSyncService.delete(new EntityWrapper<WrkLocSync>().eq("matnr", executeData.getMatnr()))) {
log.info("搴撳瓨鍚屾鍒犻櫎浠诲姟澶辫触,浠诲姟matnr=" + executeData.getMatnr() + "鏃堕棿=" + new Date());
@@ -136,4 +141,12 @@
}
}
+
+ @RequestMapping(value = "/locsync/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<LocSum> locSums = locSyncService.queryLocSum();
+ return R.ok(exportSupport(locSums, fields));
+ }
}
--
Gitblit v1.9.1