From d8d129a2e41f7099968cb4f4dc1b028ab985135f Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 16 十一月 2023 20:20:47 +0800
Subject: [PATCH] Changes14
---
mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
index 356a15d..9a7faff 100644
--- a/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
+++ b/mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java
@@ -17,14 +17,15 @@
package com.chinaztt.mes.plan.controller;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.chinaztt.mes.basic.service.StaffService;
import com.chinaztt.mes.common.wrapper.QueryWrapperUtil;
import com.chinaztt.mes.plan.dto.*;
import com.chinaztt.mes.plan.entity.CustomerOrder;
import com.chinaztt.mes.plan.entity.MoTestStandardParam;
import com.chinaztt.mes.plan.service.*;
+import com.chinaztt.mes.plan.vo.CustomerOrderVO1;
import com.chinaztt.mes.quality.dto.CustomOrderSyncDTO;
import com.chinaztt.mes.quality.entity.TestStandardParam;
import com.chinaztt.mes.quality.service.TestStandardParamService;
@@ -50,7 +51,6 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -87,6 +87,8 @@
private final SysDictItemService sysDictItemService;
+ private final StaffService staffService;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -97,8 +99,29 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ", notes = "鍒嗛〉鏌ヨ")
@GetMapping("/page/{type}")
public R getCustomerOrderPage(Page page, CustomerOrderDTO planCustomerOrder, @PathVariable("type") String type) {
- log.info("鏉′欢=================銆�"+ JSONObject.toJSONString(planCustomerOrder));
return R.ok(customerOrderService.getCustomerOrderPage(page, QueryWrapperUtil.gen(planCustomerOrder), type));
+ }
+
+ /**
+ * 鍚屾otc璁㈠崟鏁版嵁
+ *
+ * @param selectTime 閫夋嫨鏃ユ湡锛屾煡璇㈣鏃ユ湡鍚庤嚦褰撳墠鏃堕棿鐨勬暟鎹�
+ * @param orderNo 璁㈠崟缂栧彿
+ * @return
+ */
+ @GetMapping("/otcCustomerOrderSync")
+ public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("orderNo") String orderNo) {
+ return customerOrderService.otcCustomerOrderSync(selectTime, orderNo);
+ }
+
+ /**
+ *閫夋嫨缁戝畾浜哄憳
+ * @return
+ */
+ @ApiOperation(value = "閫夋嫨缁戝畾浜哄憳", notes = "閫夋嫨缁戝畾浜哄憳")
+ @GetMapping("/chooseStaff")
+ public R chooseStaff() {
+ return R.ok(staffService.chooseStaff());
}
/**
@@ -165,8 +188,8 @@
*/
@ApiOperation(value = "淇敼瀹㈡埛璁㈠崟琛�", notes = "淇敼瀹㈡埛璁㈠崟琛�")
@SysLog("淇敼瀹㈡埛璁㈠崟琛�")
- @PutMapping
- public R updateById(@RequestBody CustomerOrderDTO customerOrderDTO) {
+ @PutMapping("/updateById")
+ public R updateById(@RequestBody CustomerOrderVO1 customerOrderDTO) {
return customerOrderService.fullUpdate(customerOrderDTO);
}
@@ -303,19 +326,6 @@
public R validatePackageCodeSnCustomerOrder(@RequestBody PackagingDTO packagingDTO) {
return R.ok(customerOrderService.validatePackageCodeSnCustomerOrder(packagingDTO));
}
-
- /**
- * 鍚屾otc璁㈠崟鏁版嵁
- *
- * @param selectTime 閫夋嫨鏃ユ湡锛屾煡璇㈣鏃ユ湡鍚庤嚦褰撳墠鏃堕棿鐨勬暟鎹�
- * @param orderNo 璁㈠崟缂栧彿
- * @return
- */
- @GetMapping("/otcCustomerOrderSync")
- public R otcCustomerOrderSync(@RequestParam("selectTime") String selectTime, @RequestParam("orderNo") String orderNo) {
- return customerOrderService.otcCustomerOrderSync(selectTime, orderNo);
- }
-
/**
* 鏇存柊璁㈠崟琛岃鏄�
@@ -518,6 +528,7 @@
*/
@DeleteMapping("/processConfigFile/{id}")
public R processConfigFile(@PathVariable Long id) {
+ System.out.println("鎵ц鍒犻櫎------>"+id);
return customerOrderService.deleteProcessConfigFile(id);
}
--
Gitblit v1.9.3