root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:打印模板新增合同号，回传限制修改

Browse Source
This commit is contained in:
liuxy
2023-05-06 10:56:34 +08:00
parent 686a6b2a0b
commit 7d0791027f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -4834,6 +4834,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); // 送货方地址 oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); // 送货方地址
oneMap.put("deliveryname", jsonMst.getString("deliveryname")); // 送货方联系人 oneMap.put("deliveryname", jsonMst.getString("deliveryname")); // 送货方联系人
oneMap.put("deliveryphone", jsonMst.getString("deliveryphone")); // 送货方联系电话 oneMap.put("deliveryphone", jsonMst.getString("deliveryphone")); // 送货方联系电话
oneMap.put("contractno", jsonMst.getString("contractno")); // 合同号
} else { } else {
if (ObjectUtil.isEmpty(jsonCust)) throw new BadRequestException("客户不存在"); if (ObjectUtil.isEmpty(jsonCust)) throw new BadRequestException("客户不存在");
@@ -4888,6 +4889,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); // 送货方地址 oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); // 送货方地址
oneMap.put("deliveryname", jsonMst.getString("deliveryname")); // 送货方联系人 oneMap.put("deliveryname", jsonMst.getString("deliveryname")); // 送货方联系人
oneMap.put("deliveryphone", jsonMst.getString("deliveryphone")); // 送货方联系电话 oneMap.put("deliveryphone", jsonMst.getString("deliveryphone")); // 送货方联系电话
oneMap.put("contractno", jsonMst.getString("contractno")); // 合同号
} }
// 6.多组填充 // 6.多组填充

2
lms/nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -413,7 +413,7 @@ export default {
} else { } else {
this.confirm_flag = true this.confirm_flag = true
} }
if (current.bill_status === '40') { if (current.bill_status === '40' || current.bill_status === '30') {
this.outReturn_flag = false this.outReturn_flag = false
} else { } else {
this.outReturn_flag = true this.outReturn_flag = true