From 57f9a55581343a805cd589bbdc00e4d28a28aa97 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 28 七月 2025 13:26:42 +0800
Subject: [PATCH] erp对接
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 93 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 84 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 2e40bd2..651099f 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -1,17 +1,22 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.OrderDetlService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
+import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +28,11 @@
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private DocTypeService docTypeService;
@RequestMapping(value = "/orderDetl/{id}/auth")
@ManagerAuth
@@ -40,8 +50,20 @@
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
+ }
+// wrapper.eq("status", 1);
+ Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ return R.ok(orderDetlPage);
+ }
+
+ @RequestMapping(value = "/orderDetl/pakout/list/auth")
+ @ManagerAuth
+ public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
@@ -74,15 +96,68 @@
return R.ok();
}
+ /**
+ * 璁㈠崟鏄庣粏鎵嬪姩涓婃姤
+ * @param ids 璁㈠崟鏄庣粏id
+ * @return
+ */
+ @RequestMapping(value = "/orderDetl/manualReporting/auth")
+ @ManagerAuth
+ public R manualReporting(@RequestParam(value="ids[]") Long[] ids){
+ R r = R.ok();
+ for (Long id : ids){
+ OrderDetl orderDetl = orderDetlService.selectById(id);
+ if(orderDetl.getAnfme().equals(orderDetl.getWorkQty())){
+ return R.error("鐗╂枡缂栧彿={"+orderDetl.getMatnr()+"}瀹屾垚鏁伴噺鍜屼綔涓氭暟閲忎笉鐩稿悓鏃犳硶鎵嬪姩涓婃姤");
+ }
+ if(!Cools.isEmpty(orderDetl.getUnits())&&orderDetl.getUnits().equals(orderDetl.getAnfme())){
+ r= R.error("涓婃姤鏁伴噺鍜屽畬鎴愭暟閲忎竴鑷寸姝笂鎶�");
+ }
+ r = orderDetlService.U8Reporting(id, 1);
+ }
+ return r;
+ }
+
+ /**
+ * 璁㈠崟鏄庣粏鍏抽棴
+ * @param ids 璁㈠崟鏄庣粏id
+ * @return
+ */
@RequestMapping(value = "/orderDetl/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
+ R r = R.ok();
for (Long id : ids){
- orderDetlService.deleteById(id);
- }
- return R.ok();
+ OrderDetl orderDetl = orderDetlService.selectById(id);
+ if(orderDetl.getAnfme().equals(orderDetl.getWorkQty())){
+ return R.error("鐗╂枡缂栧彿={"+orderDetl.getMatnr()+"}瀹屾垚鏁伴噺鍜屼綔涓氭暟閲忎笉鐩稿悓鏃犳硶鍏抽棴");
+ }
+ r = orderDetlService.U8Reporting(id, 0);
+ }
+ return r;
}
+ /**
+ * 璁㈠崟鏄庣粏鍚敤
+ * @param ids 璁㈠崟鏄庣粏id
+ * @return
+ */
+ @RequestMapping(value = "/orderDetl/enable/auth")
+ @ManagerAuth
+ public R enable(@RequestParam(value="ids[]") Long[] ids){
+ R r = R.ok();
+ for (Long id : ids){
+// OrderDetl orderDetl = orderDetlService.selectById(id);
+// if(orderDetl.getAnfme().equals(orderDetl.getWorkQty())){
+// return R.error("鐗╂枡缂栧彿={"+orderDetl.getMatnr()+"}瀹屾垚鏁伴噺鍜屼綔涓氭暟閲忎笉鐩稿悓鏃犳硶鍚敤");
+// }
+ r = orderDetlService.U8Reporting(id, 1);
+ }
+ return r;
+ }
+
+
+
@RequestMapping(value = "/orderDetl/export/auth")
@ManagerAuth
public R export(@RequestBody JSONObject param){
--
Gitblit v1.9.1