From 7d0791027f891cb95729c948068ee02388fe2d73 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 6 May 2023 10:56:34 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=89=93=E5=8D=B0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E5=90=8C=E5=8F=B7=EF=BC=8C=E5=9B=9E?= =?UTF-8?q?=E4=BC=A0=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java | 2 ++ lms/nladmin-ui/src/views/wms/st/outbill/index.vue | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 12a60f74d..8a6ce8d6b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -4834,6 +4834,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); // 送货方地址 oneMap.put("deliveryname", jsonMst.getString("deliveryname")); // 送货方联系人 oneMap.put("deliveryphone", jsonMst.getString("deliveryphone")); // 送货方联系电话 + oneMap.put("contractno", jsonMst.getString("contractno")); // 合同号 } else { if (ObjectUtil.isEmpty(jsonCust)) throw new BadRequestException("客户不存在"); @@ -4888,6 +4889,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); // 送货方地址 oneMap.put("deliveryname", jsonMst.getString("deliveryname")); // 送货方联系人 oneMap.put("deliveryphone", jsonMst.getString("deliveryphone")); // 送货方联系电话 + oneMap.put("contractno", jsonMst.getString("contractno")); // 合同号 } // 6.多组填充 diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index a1da2591c..8846a5b60 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -413,7 +413,7 @@ export default { } else { this.confirm_flag = true } - if (current.bill_status === '40') { + if (current.bill_status === '40' || current.bill_status === '30') { this.outReturn_flag = false } else { this.outReturn_flag = true