From 133e9fccff97927467a2edbfec8ae1f382722fae Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 27 一月 2024 16:31:38 +0800
Subject: [PATCH] # 打印物料码 文本自动换行
---
src/main/java/com/zy/asrs/controller/OrderController.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 936ebe1..f47db1a 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -9,7 +9,6 @@
import com.core.annotations.ManagerAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.sun.org.apache.xpath.internal.operations.Or;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.OrderDetlVo;
@@ -134,13 +133,13 @@
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
param.getDocType(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
- null, //
+ param.getItemName(), //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
+ param.getNumber(), // 绁ㄦ嵁鍙�
+ param.getCstmr(), // 瀹㈡埛缂栧彿
+ param.getCstmrName(), // 瀹㈡埛
+ param.getTel(), // 鑱旂郴鏂瑰紡
null, // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
null, // 浼樻儬鐜�
@@ -169,14 +168,7 @@
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetl orderDetl : param.getOrderDetlList()) {
- if (Cools.isEmpty(orderDetl.getOwner())){
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ヨ揣涓荤紪鍙�");
- }else {
- LocOwner locOwner = locOwnerService.selectById(orderDetl.getOwner());
- if (Cools.isEmpty(locOwner)){
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�,璇疯緭鍏ュ瓨鍦ㄧ殑璐т富缂栧彿锛堟暣鏁帮級");
- }
- }
+
if (orderDetl.getBatch() == null) {
orderDetl.setBatch("");
}
@@ -197,9 +189,6 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- if(orderDetl.getPayment() == null){
- orderDetl.setPayment(1);
- }
orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -220,9 +209,14 @@
Date now = new Date();
Long userId = getUserId();
// 淇敼涓绘。
- if (!param.getDocType().equals(order.getDocType())) {
+ if (!param.getDocType().equals(order.getDocType()) || param.getCstmrName() != order.getCstmrName() || !Cools.eq(param.getItemName(),order.getItemName())) {
order.setDocType(param.getDocType());
order.setUpdateBy(userId);
+ order.setCstmr(param.getCstmr());
+ order.setCstmrName(param.getCstmrName());
+ order.setTel(param.getTel());
+ order.setNumber(param.getNumber());
+ order.setItemName(param.getItemName());
order.setUpdateTime(now);
if (!orderService.updateById(order)) {
throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
@@ -353,13 +347,18 @@
@ManagerAuth
public R query(String condition) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
+ wrapper.like("order_no", condition);
Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Order order : page.getRecords()){
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getOrderNo());
+ map.put("customer",order.getCstmrName());
+ map.put("phone",order.getTel());
+ map.put("addr",order.getNumber());
+ map.put("allocate",order.getItemName());
+ map.put("type","order");
result.add(map);
}
return R.ok(result);
@@ -403,7 +402,7 @@
List<OrderDetlVo> orderDetlVos=new ArrayList<>();
OrderDetlVo orderDetlVo=new OrderDetlVo();
for (OrderDetl o:
- list) {
+ list) {
orderDetlVo.setOrderNo(o.getOrderNo());
orderDetlVo.setMatnr(o.getMatnr());
orderDetlVo.setMaktx(o.getMaktx());
--
Gitblit v1.9.1