From 5dd6f4aa2123671e95907ee19f5925a98983cdc8 Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 25 三月 2024 10:05:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 63 +++++++++++++++++++++++++------ 1 files changed, 50 insertions(+), 13 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 e73f0da..bde189c 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 @@ -1,12 +1,9 @@ package com.vci.ubcs.code.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.vci.ubcs.code.dto.DockingSystemConfigDTO; import com.vci.ubcs.code.dto.DockingSystemDTO; -import com.vci.ubcs.code.dto.DockingTaskDTO; import com.vci.ubcs.code.dto.UpdateSysInfoStatusDTO; import com.vci.ubcs.code.entity.*; import com.vci.ubcs.code.service.*; @@ -38,6 +35,7 @@ @RequestMapping("/dockingManagement") @Api(value = "鎺ュ彛绠$悊", tags = "缂栫爜鐩稿叧鎺ュ彛绠$悊淇℃伅") public class DockingManagementController { + /*** * 闆嗘垚绯荤粺绠$悊鏈嶅姟 */ @@ -47,6 +45,7 @@ * 闆嗘垚鎺ュ彛閰嶇疆鏈嶅姟 */ private final IDockingSystemConfigService dockingSystemConfigService; + /*** * 寰呴泦绠$悊閰嶇疆鏈嶅姟 */ @@ -56,6 +55,9 @@ * 鍚屾闆嗘垚鏈嶅姟 */ private final ICodeDuckingSyncService codeDuckingSyncService; + + /*@Value("${erp.item.btmName:XHDH}") + private String ERP_ITEM_BTMNAME;*/ /**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛� * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 @@ -87,7 +89,6 @@ return R.status(res); } - /** * 淇敼 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭� * @param dockingSystemDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞� @@ -98,7 +99,6 @@ DockingSystemVO dockingSystemVO = dockingSystemService.editSave(dockingSystemDTO); return R.data(dockingSystemVO); } - /** * 鍒犻櫎绯荤粺闆嗘垚鐨勭郴缁熶俊鎭� @@ -114,6 +114,7 @@ } return R.success("鎿嶄綔鎴愬姛"); } + /** * 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 @@ -130,7 +131,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); } @@ -163,6 +164,7 @@ return R.fail("淇濆瓨澶辫触!"); } } + /** * 鍒犻櫎绯荤粺闆嗘垚绯荤粺閰嶇疆淇℃伅 * @param oids 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈� @@ -177,6 +179,7 @@ } return R.success("鎿嶄綔鎴愬姛"); } + /*** * 鎺ュ彛淇℃伅鏄惁鍚敤/鍋滅敤 * @param sysInfoStatusDTO @@ -217,7 +220,6 @@ return R.data(pages); } - /** * data鍒楄〃 * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 @@ -254,37 +256,58 @@ } 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); } /** * 鎺ュ彛param鍒楄〃 - * @param dockingSysIntParam 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃 */ @GetMapping("/gridParam") @ApiOperationSupport(order = 3) @ApiOperation(value = "鍒嗛〉", notes = "dockingSysIntParam") - public R<IPage<DockingSysIntParamVO>>gridParam(DockingSysIntParam dockingSysIntParam, Query query){ - IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(dockingSysIntParam,query); + public R<IPage<DockingSysIntParamVO>>gridParam(BaseQueryObject queryObject){ + Map<String,String> condtionMap=queryObject.getConditionMap(); + Query query=new Query(); + if(CollectionUtils.isEmpty(condtionMap)){ + condtionMap=new HashMap<>(); + } + query.setCurrent(queryObject.getPage()); + query.setSize(queryObject.getLimit()); + IPage<DockingSysIntParamVO> pages = dokingSysManaentService.gridParam(condtionMap,query); return R.data(pages); } /** * 鎺ュ彛param鍒楄〃 - * @param dockingSysIntHeader 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 + * @param queryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃 */ @GetMapping("/gridHeader") @ApiOperationSupport(order = 3) @ApiOperation(value = "鍒嗛〉", notes = "DockingSysIntHeaderVO") - public R<IPage<DockingSysIntHeaderVO>>gridHeader(DockingSysIntHeader dockingSysIntHeader, Query query){ - IPage<DockingSysIntHeaderVO> pages=dokingSysManaentService.gridHeader(dockingSysIntHeader,query); + public R<IPage<DockingSysIntHeaderVO>>gridHeader(BaseQueryObject queryObject){ + Map<String,String> condtionMap=queryObject.getConditionMap(); + Query query=new Query(); + if(CollectionUtils.isEmpty(condtionMap)){ + condtionMap=new HashMap<>(); + } + query.setCurrent(queryObject.getPage()); + query.setSize(queryObject.getLimit()); + IPage<DockingSysIntHeaderVO> pages=dokingSysManaentService.gridHeader(condtionMap,query); return R.data(pages); } + /** *鎵归噺澶勭悊 * 蹇呴』瑕佹湁鍒嗙被oid鍜宒ataoid @@ -294,4 +317,18 @@ public R sendData(String oid){ return codeDuckingSyncService.sendData(oid); } + + /*** + * 椤圭洰鍨嬪彿浠e彿鏌ヨ鍚屾 + * @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