From 156e136377680ac2dd5ad89735b7273db6f6d1d5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 24 二月 2024 20:27:02 +0800
Subject: [PATCH] 远程部署功能完善
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index 1f745af..30b4b15 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -17,10 +17,13 @@
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import javafx.scene.control.TableRow;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -56,6 +59,9 @@
* 鍚屾闆嗘垚鏈嶅姟
*/
private final ICodeDuckingSyncService codeDuckingSyncService;
+
+ /*@Value("${erp.item.btmName:XHDH}")
+ private String ERP_ITEM_BTMNAME;*/
/**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
* @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
@@ -130,7 +136,7 @@
}
query.setCurrent(queryObject.getPage());
query.setSize(queryObject.getLimit());
- IPage<DockingSystemConfigVO> pages=dockingSystemConfigService.page(condtionMap,query);
+ IPage<DockingSystemConfigVO> pages= dockingSystemConfigService.page(condtionMap,query);
return R.data(pages);
}
@@ -254,6 +260,12 @@
}
query.setCurrent(queryObject.getPage());
query.setSize(queryObject.getLimit());
+ if(queryObject.getOrder().equals("asc")){
+ query.setAscs(queryObject.getSort());
+ }else{
+ query.setDescs(queryObject.getSort());
+ }
+
IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
return R.data(pages);
}
@@ -308,4 +320,18 @@
public R sendData(String oid){
return codeDuckingSyncService.sendData(oid);
}
+
+ /***
+ * 椤圭洰鍨嬪彿浠ｅ彿鏌ヨ鍚屾
+ * @return
+ */
+ @PostMapping("/searchItemDataForERP")
+ public R searchItemDataForERP(String endDate){
+ try {
+ codeDuckingSyncService.saveItemDataSyncScheduing(endDate);
+ return R.success("鍚屾鎴愬姛");
+ }catch (Throwable e){
+ return R.fail("鍚屾澶辫触");
+ }
+ }
}
--
Gitblit v1.9.3