From 0d1b934681464f8e36fa4c62b27bb2d2eb62768b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 26 五月 2023 09:45:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 6 +++++-
src/main/java/com/zy/asrs/entity/param/CombParam.java | 3 +++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 7 ++++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 020d48a..8f93ef0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -92,11 +92,15 @@
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
public R formAdd(@RequestBody OrderDomainParam param){
+ int payment = 0;
if(Cools.isEmpty(param.getOrderNo())){
String prefix = "";
DocType docType = docTypeService.selectById(param.getDocType());
if(!Cools.isEmpty(docType)){
prefix = docType.getPakin() == 1 ? "RK" : "CK";
+ }
+ if (prefix.equals("CK")){
+ payment = 1;
}
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
}
@@ -174,7 +178,7 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
- orderDetl.setPayment(1);
+ orderDetl.setPayment(payment);
orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index fda89ff..3693711 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -27,6 +27,9 @@
@Data
public static class CombMat {
+ // 鍗曟嵁缂栧彿
+ private String orderNo;
+
// 鐗╂枡缂栧彿
private String matnr;
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 82494e0..bee7db5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -95,6 +95,11 @@
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
+ try{
+ param.setOrderNo(param.getCombMats().get(0).getOrderNo());
+ }catch (Exception e){
+
+ }
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -608,7 +613,7 @@
if (Cools.isEmpty(node, order)) {
return R.error("鍙傛暟涓虹┖");
}
- OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),jsonOrderDetl.getMaktx());
+ OrderDetl orderDetl = orderDetlService.selectItem(jsonOrderDetl.getOrderNo(),jsonOrderDetl.getMatnr(),"");
if (Cools.isEmpty(orderDetl)) {
return R.error("鍗曟嵁鏄庣粏鏈夎,璇锋鏌�");
}
--
Gitblit v1.9.1