From 6575ff94ec9ab3d2f5cb4155b422abe055b709f6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 18:10:15 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/stockOut.html | 2 +-
src/main/webapp/static/js/order/order.js | 2 +-
src/main/java/zy/cloud/wms/manager/entity/param/StockConfirmParam.java | 2 +-
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 26 ++++----------------------
4 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/param/StockConfirmParam.java b/src/main/java/zy/cloud/wms/manager/entity/param/StockConfirmParam.java
index 80eeb5d..fea9426 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/param/StockConfirmParam.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/param/StockConfirmParam.java
@@ -10,6 +10,6 @@
private String wrkNo;
- private String number;
+ private String orderNo;
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 97bb4bc..25d03af 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -257,7 +257,7 @@
vo.setList(pakouts);
vo.setTotal(total);
vo.setCstmrName(order.getCstmrName());
- vo.setWorkerName(order.getOperMemb());
+ vo.setWorkerName(Cools.isEmpty(order.getOperMemb())? "" : order.getOperMemb());
return R.ok().add(vo);
}
@@ -265,7 +265,7 @@
@Transactional
public R stockOutComplete(StockConfirmParam param, Long userId) {
List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>()
- .eq("doc_num", param.getNumber())
+ .eq("doc_num", param.getOrderNo())
.in("wrk_sts", 1, 2));
for (Pakout pakout : pakouts) {
LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
@@ -334,31 +334,13 @@
}
// 淇敼鍑哄簱鍗曠姸鎬�
- if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
+ if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getOrderNo(), userId)) {
return R.error("淇濆瓨鏁版嵁澶辫触");
}
// 淇敼鍗曟嵁鐘舵��
- if (!custOrderService.updateStatus(param.getNumber(), 4)) {
+ if (!orderService.updateSettle(param.getOrderNo(), 4L)) {
throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
}
- // 閲囪喘閫�璐у崟
-// if (param.getNumber().startsWith("PR-")) {
- // erp鍗曟嵁涓婁紶 todo
-// Long docId = pakouts.get(0).getDocId();
-// if (null != docId) {
-// List<BillDto> dtos = new ArrayList<>();
-// for (Pakout pakout : pakouts) {
-// BillDto billDto = new BillDto();
-// billDto.setMatnr(pakout.getMatnr());
-// billDto.setQty(pakout.getAnfme());
-// dtos.add(billDto);
-// }
-// if (!erpService.uploadBill(dtos, docId.intValue() , pakouts.get(0).getDocNum())) {
-// throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
-// }
-// }
-
-// }
return R.ok();
}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 45e8b2b..6206983 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -457,7 +457,7 @@
url: baseUrl+"/pakout/print/auth",
headers: {'token': localStorage.getItem('token')},
data: {
- docNumber: docNumber
+ docNumber: orderNo
},
method: 'POST',
success: function (res) {
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 6de3aab..488ee7a 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -165,7 +165,7 @@
url: baseUrl+"/work/stock/out/confirm",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
- number: docNum
+ orderNo: docNum
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
--
Gitblit v1.9.1