From 40631d025469ac3fb60a57dfab1d9022cb0298a6 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期二, 25 三月 2025 16:57:46 +0800
Subject: [PATCH] 站点退回操作，防止改成空库位
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 379 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 314 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 2a3f91e..77bc3c8 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -1,7 +1,7 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -10,11 +10,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.AgvWrkDetl;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.mapper.AgvWrkDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
+import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,6 +42,9 @@
@Autowired
private AgvLocDetlService agvLocDetlService;
+ @Autowired
+ private AgvWrkDetlMapper agvWrkDetlMapper;
+
@RequestMapping(value = "/orderDetl/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
@@ -47,15 +53,17 @@
@RequestMapping(value = "/orderDetl/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -64,23 +72,25 @@
@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){
+ 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)));
}
@RequestMapping(value = "/orderDetl/pakout/list/authV2")
@ManagerAuth
- public R pakoutList2(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R pakoutList2(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("create_time", false);
}
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
@@ -89,37 +99,58 @@
docIds.add(pakin.getDocId());
}
EntityWrapper<Order> orderEntityWrapper = new EntityWrapper<>();
- List<Order> orders = orderService.selectList(orderEntityWrapper.in("doc_type",docIds));
+ List<Order> orders = orderService.selectList(orderEntityWrapper.in("doc_type", docIds));
List<String> orderNos = new ArrayList<>();
for (Order order : orders) {
orderNos.add(order.getOrderNo());
}
- wrapper.in("order_no",orderNos);
+ wrapper.in("order_no", orderNos);
return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
- @RequestMapping(value = "/orderDetl/pakout/list/authV3")
+ @RequestMapping(value = "/orderDetl/pakout/list/authV193")
@ManagerAuth
- public R pakoutList3(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R pakoutList193(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) Long docType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ param.remove("docType");
excludeTrash(param);
convertLike(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("create_time", false);
}
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
List<Long> docIds = new ArrayList<>();
+
+ List<Long> unDocIds = new ArrayList<>();
+ unDocIds.add(18L);
+ unDocIds.add(31L);
+ unDocIds.add(33L);
+ unDocIds.add(34L);
+ unDocIds.add(35L);
+ unDocIds.add(37L);
for (DocType pakin : pakins) {
- if (pakin.getDocId() != 33 && pakin.getDocId() != 34) {
+ if (!unDocIds.contains(pakin.getDocId())) {
docIds.add(pakin.getDocId());
}
}
- wrapper.in("source",docIds);
+ if (docIds.size() > 0) {
+ if (docType > 0) {
+ wrapper.in("source", docType);
+ } else {
+ wrapper.in("source", docIds);
+ }
+
+ } else {
+ wrapper.in("source", 0);
+ }
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
for (OrderDetl record : page.getRecords()) {
Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
@@ -129,20 +160,114 @@
return R.ok(page);
}
- /*
- * 鍗婃垚鍝佸姞宸ュ崟鎹�
- * */
- @RequestMapping(value = "/orderDetl/pakout/list/authV5")
+ @RequestMapping(value = "/orderDetl/pakout/list/authV3")
+ @Synchronized
@ManagerAuth
- public R pakoutList5(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R pakoutList3(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
convertLike(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
+ }
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() != 17 && pakin.getDocId() != 33 && pakin.getDocId() != 34 && pakin.getDocId() != 35) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+ wrapper.in("source", docIds);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
+ }
+ return R.ok(page);
+ }
+
+ @RequestMapping(value = "/orderDetl/pakout/list/authV7")
+ @ManagerAuth
+ public R pakoutList7(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ Object o = param.get("orderType");
+ boolean flag = false;
+ if (o != null) {
+ String[] split = o.toString().split(",");
+ //-1璇存槑鏄崐鎴愬搧绠卞３鍑哄簱鍗�
+ if (split[0].equals("-1")) {
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() != 33) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+ wrapper.andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT).andNew().in("source", docIds);
+ flag = true;
+ } else {
+ wrapper.in("source", split);
+ }
+ param.remove("orderType");
+ }
+ convertLike(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
+ }
+// List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+// List<Long> docIds = new ArrayList<>();
+// for (DocType pakin : pakins) {
+// if (pakin.getDocId() != 17 && pakin.getDocId() != 33 && pakin.getDocId() != 34 && pakin.getDocId() != 35) {
+// docIds.add(pakin.getDocId());
+// }
+// }
+// wrapper.in("source", docIds);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme;
+ if (flag) {
+ sumAnfme = agvLocDetlService.getSumAnfme2(record.getMatnr(), record.getThreeCode());
+ } else {
+ sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
+ }
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
+ }
+ return R.ok(page);
+ }
+
+ /*
+ * 鍗婃垚鍝佸姞宸ュ崟鎹�
+ * */
+ @RequestMapping(value = "/orderDetl/pakout/list/authV5")
+ @ManagerAuth
+ public R pakoutList5(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convertLike(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("create_time", false);
}
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
@@ -152,11 +277,11 @@
docIds.add(pakin.getDocId());
}
}
-
- wrapper.in("source",docIds);
+ wrapper.eq("process_sts", 1);
+ wrapper.in("source", docIds);
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
for (OrderDetl record : page.getRecords()) {
- Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
+ Double sumAnfme = agvLocDetlService.getSumAnfmeProcess(record.getMatnr(), record.getThreeCode());
record.setStock(sumAnfme == null ? 0 : sumAnfme);
}
@@ -165,15 +290,17 @@
@RequestMapping(value = "/orderDetl/pakout/list/authV4")
@ManagerAuth
- public R pakoutList4(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R pakoutList4(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
convertLike(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("create_time", false);
}
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
@@ -184,33 +311,155 @@
}
}
- wrapper.in("source",docIds);
+ wrapper.in("source", docIds);
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
for (OrderDetl record : page.getRecords()) {
- Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
+ Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed(record.getMatnr(), record.getThreeCode());
record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
}
return R.ok(page);
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+
+ @RequestMapping(value = "/orderDetl/pakout/list/authV8")
+ @ManagerAuth
+ public R pakoutList8(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convertLike(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
+ }
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() == 34) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+
+ wrapper.in("source", docIds);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed2(record.getMatnr(), record.getThreeCode());
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
+ }
+
+ return R.ok(page);
+ }
+
+ @RequestMapping(value = "/orderDetl/pakout/list/authV9")
+ @ManagerAuth
+ public R pakoutList9(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convertLike(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
+ }
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() == 48) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+
+ wrapper.in("source", docIds);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed2(record.getMatnr(), record.getThreeCode());
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
+ }
+
+ return R.ok(page);
+ }
+
+ @RequestMapping(value = "/orderDetl/pakout/list/authV6")
+ @ManagerAuth
+ public R pakoutList6(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convertLike(param, wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("create_time", false);
+ }
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ if (pakin.getDocId() == 37 || pakin.getDocId() == 43) {
+ docIds.add(pakin.getDocId());
+ }
+ }
+
+ wrapper.in("source", docIds);
+ Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ for (OrderDetl record : page.getRecords()) {
+ Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
+ record.setStock(sumAnfme == null ? 0 : sumAnfme);
+ //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+ //record.setWorkNum(workNum == null ? 0 : workNum);
+ }
+
+ return R.ok(page);
+ }
+
+ @RequestMapping(value = "/orderDetl/pakout/workNum")
+ @ManagerAuth
+ public R listWorkDetl() {
+ List<AgvWrkDetl> agvWrkDetls = agvWrkDetlMapper.listAnfmeByMatnr();
+ return R.ok(agvWrkDetls);
+
+ }
+
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.eq(entry.getKey(), val);
+ if (entry.getKey().equals("order_id")) {
+ wrapper.eq(entry.getKey(), val);
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+
}
}
}
- private <T> void convertLike(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convertLike(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -227,11 +476,11 @@
return R.ok();
}
- @RequestMapping(value = "/orderDetl/update/auth")
- @ManagerAuth
- public R update(OrderDetl orderDetl){
- if (Cools.isEmpty(orderDetl) || null==orderDetl.getId()){
- return R.error();
+ @RequestMapping(value = "/orderDetl/update/auth")
+ @ManagerAuth
+ public R update(OrderDetl orderDetl) {
+ if (Cools.isEmpty(orderDetl) || null == orderDetl.getId()) {
+ return R.error("鍙傛暟缂哄け");
}
orderDetlService.updateById(orderDetl);
return R.ok();
@@ -239,8 +488,8 @@
@RequestMapping(value = "/orderDetl/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
orderDetlService.deleteById(id);
}
return R.ok();
@@ -248,7 +497,7 @@
@RequestMapping(value = "/orderDetl/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
@@ -264,7 +513,7 @@
wrapper.like("id", condition);
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderDetl orderDetl : page.getRecords()){
+ for (OrderDetl orderDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", orderDetl.getId());
map.put("value", orderDetl.getId());
@@ -277,7 +526,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderDetl> wrapper = new EntityWrapper<OrderDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderDetlService.selectOne(wrapper)){
+ if (null != orderDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderDetl.class, String.valueOf(param.get("key"))));
}
return R.ok();
--
Gitblit v1.9.1