From 539a56279625242c497b4b4093f2defbb9d80334 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 29 一月 2026 14:05:44 +0800
Subject: [PATCH] #i18n翻译
---
src/main/java/com/zy/asrs/controller/OrderController.java | 133 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 112 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 8063a13..32f6fbe 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -9,9 +9,12 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
+
+import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -33,6 +36,12 @@
private WrkDetlService wrkDetlService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -59,7 +68,9 @@
}
}
}
- return R.ok().add(orders);
+ R r = R.ok();
+ r.put("data", orders);
+ return r;
}
@RequestMapping(value = "/order/head/page/auth")
@@ -82,11 +93,13 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
public R head(@RequestParam Long orderId){
- return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
+ R r = R.ok();
+ r.put("data",orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
+ return r;
}
@RequestMapping(value = "/order/form/add/auth")
- @ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
+ @ManagerAuth(memo = "response.manual_add_order")
@Transactional
public R formAdd(@RequestBody OrderDomainParam param){
if(Cools.isEmpty(param.getOrderNo())){
@@ -99,7 +112,7 @@
}
Order order = orderService.selectByNo(param.getOrderNo());
if (order != null) {
- return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
+ return R.error("response.order_no_exists");
}
Date now = new Date();
order = new Order(
@@ -139,7 +152,7 @@
null // 澶囨敞
);
if (!orderService.insert(order)) {
- throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
+ throw new CoolException("response.save_order_master_failed");
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
@@ -148,7 +161,7 @@
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ throw new CoolException("response.save_order_detail_failed");
}
} else {
list.add(dto);
@@ -161,20 +174,20 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ throw new CoolException("response.save_order_detail_failed");
}
}
}
- return R.ok("璁㈠崟娣诲姞鎴愬姛");
+ return R.ok("response.order_add_success");
}
@RequestMapping(value = "/order/form/modify/auth")
- @ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
+ @ManagerAuth(memo = "response.manual_modify_order")
@Transactional
public R formModify(@RequestBody OrderDomainParam param){
Order order = orderService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
- return R.error("璁㈠崟涓嶅瓨鍦�");
+ return R.error("response.order_not_exist");
}
Date now = new Date();
Long userId = getUserId();
@@ -184,14 +197,14 @@
order.setUpdateBy(userId);
order.setUpdateTime(now);
if (!orderService.updateById(order)) {
- throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
+ throw new CoolException("response.modify_order_type_failed");
}
}
// 淇敼鏄庣粏妗�
// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// 1.娓呯┖鏄庣粏妗�
if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
- throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
+ throw new CoolException("response.clear_order_detail_failed");
}
// 2.閲嶇粍鏁版嵁
List<DetlDto> list = new ArrayList<>();
@@ -201,7 +214,7 @@
OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ throw new CoolException("response.save_order_detail_failed");
}
} else {
list.add(dto);
@@ -214,11 +227,87 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
+ throw new CoolException("response.save_order_detail_failed");
}
}
}
- return R.ok("璁㈠崟淇敼鎴愬姛");
+ return R.ok("response.order_modify_success");
+ }
+
+ @PostMapping(value = "/order/wrk/trace/auth")
+ @ManagerAuth
+ public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
+ Order order = orderService.selectById(orderId);
+ if (null == order) {
+ return R.error("response.order_not_exist");
+ }
+ // 鏁伴噺缁熻
+ double totalQty = 0;
+ double wrkQty = 0;
+ double lackQty = 0;
+ double endQty = 0;
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
+ for (OrderDetl orderDetl : orderDetls) {
+ totalQty = totalQty + orderDetl.getAnfme();
+ wrkQty = wrkQty + orderDetl.getWorkQty();
+ endQty = endQty + orderDetl.getQty();
+ double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
+ if (issued > 0.0) {
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
+ for (LocDetl locDetl : locDetls) {
+ if (issued > 0) {
+ issued = issued - locDetl.getAnfme();
+ } else {
+ break;
+ }
+ }
+ }
+ if (issued > 0.0) {
+ lackQty = lackQty + issued;
+ }
+ }
+ // 浠诲姟杩芥函
+ List<WrkTraceVo> wrkTraceVos = new ArrayList<>();
+ List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNoGroupByMatnrOfSum(order.getOrderNo());
+ for (WrkDetl wrkDetl : wrkDetls) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
+ if (wrkMast == null) {
+ WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
+ if (wrkMastLog.getIoType()==103){
+ wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
+ }
+ if (wrkMastLog != null) {
+ wrkMast = new WrkMast();
+ BeanUtils.copyProperties(wrkMastLog, wrkMast);
+ } else {
+ continue;
+ }
+ }
+ boolean exist = false;
+ for (WrkTraceVo vo : wrkTraceVos) {
+ if (vo.getWrkNo().equals(wrkMast.getWrkNo()) && vo.getIoTimeStr().equals(DateUtils.convert(wrkMast.getIoTime()))) {
+ vo.getWrkDetls().add(wrkDetl);
+ exist = true;
+ }
+ }
+ if (!exist) {
+ WrkTraceVo vo = new WrkTraceVo(wrkMast.getWrkNo(), DateUtils.convert(wrkMast.getIoTime()), wrkMast, wrkDetl);
+ wrkTraceVos.add(vo);
+ }
+ }
+ if (!Cools.isEmpty(wrkTraceVos) && wrkTraceVos.size() > 1) {
+ wrkTraceVos.sort((o1, o2) -> (int) (o2.getWrkMast().getIoTime().getTime() - o1.getWrkMast().getIoTime().getTime()));
+ }
+
+ R r = R.ok();
+ r.put("data", Cools
+ .add("list", wrkTraceVos)
+ .add("orderNo", order.getOrderNo())
+ .add("totalQty", totalQty)
+ .add("wrkQty", wrkQty+endQty)
+ .add("lackQty", lackQty)
+ .add("endQty",endQty));
+ return r;
}
@@ -269,20 +358,20 @@
int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
if (wrkCount > 0 || pakinCount > 0) {
- throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
+ throw new CoolException("response.existing_working_data_cannot_complete");
}
}
order.setUpdateBy(getUserId());
order.setUpdateTime(new Date());
if (!orderService.updateById(order)) {
- throw new CoolException("淇敼璁㈠崟澶辫触");
+ throw new CoolException("response.modify_order_failed");
}
- return R.ok();
+ return R.ok("response.order_update_success");
}
@RequestMapping(value = "/order/delete/auth")
- @ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
+ @ManagerAuth(memo = "response.manual_delete_order")
@Transactional
public R delete(@RequestParam Long orderId){
orderService.remove(orderId);
@@ -294,7 +383,7 @@
// throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
// }
// orderDetlService.modifyStatus(orderId, 0);
- return R.ok();
+ return R.ok("response.order_delete_success");
}
@RequestMapping(value = "/order/export/auth")
@@ -329,7 +418,9 @@
public R query(@RequestBody JSONObject param) {
Wrapper<Order> wrapper = new EntityWrapper<Order>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
if (null != orderService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(Order.class, String.valueOf(param.get("key"))));
+ R r = R.parse(BaseRes.REPEAT);
+ r.put("data", getComment(Order.class, String.valueOf(param.get("key"))));
+ return r;
}
return R.ok();
}
--
Gitblit v1.9.1