From 54cce185f383849322d5cc309d2ee5d155d15915 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 18:57:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mes-plan/src/main/java/com/chinaztt/mes/plan/controller/CustomerOrderController.java | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 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..13f3797 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
@@ -20,6 +20,7 @@
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;
@@ -87,6 +88,8 @@
private final SysDictItemService sysDictItemService;
+ private final StaffService staffService;
+
/**
* 鍒嗛〉鏌ヨ
*
@@ -97,8 +100,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());
}
/**
@@ -303,19 +327,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);
- }
-
/**
* 鏇存柊璁㈠崟琛岃鏄�
--
Gitblit v1.9.3