diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
index 9305340d..0f87668e 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml
@@ -67,6 +67,7 @@
+
@@ -457,6 +458,7 @@
d.unit,
e.vehicle_number,
f.NAME AS productName,
+ f.code AS productCode,
a.purchase_contract_no AS purchaseContractNo,
a.sale_contract_no AS saleContractNo,
a.purchase_amount AS purchaseAmount,
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
index 53eec1a8..12ffcd2f 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java
@@ -380,11 +380,23 @@ public class VoucherController {
entitys.add(new ExcelExportEntity("关联单据号" ,"associatedDocumentNo"));
break;
case "saleAmount" :
- entitys.add(new ExcelExportEntity("销售额" ,"saleAmount"));
- break;
+ entitys.add(new ExcelExportEntity("销售额" ,"saleAmount"));
+ break;
case "orderNo" :
entitys.add(new ExcelExportEntity("订单序号" ,"orderNo"));
break;
+ case "productName" :
+ entitys.add(new ExcelExportEntity("物料名称" ,"productName"));
+ break;
+ case "productCode" :
+ entitys.add(new ExcelExportEntity("物料编码" ,"productCode"));
+ break;
+ case "saleContractNo" :
+ entitys.add(new ExcelExportEntity("销售合同" ,"saleContractNo"));
+ break;
+ case "customerName1" :
+ entitys.add(new ExcelExportEntity("客户" ,"customerName1"));
+ break;
case "tableField111-productId":
tableField111List.add(new ExcelExportEntity("商品名称" ,"productId"));
break;
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java
index f43fd29a..72c7e929 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/VoucherEntity.java
@@ -200,6 +200,8 @@ public class VoucherEntity {
@TableField(exist = false)
private String productName;
@TableField(exist = false)
+ private String productCode;
+ @TableField(exist = false)
private List productWarehouseEntityList;
@TableField(exist = false)
private List warehousingInspectionConclusionModelList;
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js
index 2acf40ed..cd171f05 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js
@@ -119,6 +119,158 @@ const columnList = [{
"placeholder": "系统自动生成"
},
+{
+ "jnpfKey": "billRule",
+ "fullName": "物料名称",
+ "label": "物料名称",
+ "sortable": false,
+ "align": "left",
+ "__config__": {
+ "formId": 101,
+ "visibility": ["pc", "app"],
+ "jnpfKey": "billRule",
+ "defaultValue": null,
+ "noShow": false,
+ "tipLabel": "",
+ "dragDisabled": false,
+ "rule": "ssdj",
+ "className": [],
+ "label": "物料名称",
+ "trigger": "change",
+ "showLabel": true,
+ "required": false,
+ "tableName": "jg_voucher",
+ "renderKey": 1707042861597,
+ "layout": "colFormItem",
+ "tagIcon": "icon-ym icon-ym-generator-documents",
+ "ruleName": "物料名称",
+ "tag": "JnpfInput",
+ "span": 8
+ },
+ "readonly": true,
+ "prop": "productName",
+ "width": 0,
+ "__vModel__": "productName",
+ "fixed": "none",
+ "style": {
+ "width": "100%"
+ },
+
+},
+
+{
+ "jnpfKey": "billRule",
+ "fullName": "物料编码",
+ "label": "物料编码",
+ "sortable": false,
+ "align": "left",
+ "__config__": {
+ "formId": 101,
+ "visibility": ["pc", "app"],
+ "jnpfKey": "billRule",
+ "defaultValue": null,
+ "noShow": false,
+ "tipLabel": "",
+ "dragDisabled": false,
+ "rule": "ssdj",
+ "className": [],
+ "label": "物料编码",
+ "trigger": "change",
+ "showLabel": true,
+ "required": false,
+ "tableName": "jg_voucher",
+ "renderKey": 1707042861597,
+ "layout": "colFormItem",
+ "tagIcon": "icon-ym icon-ym-generator-documents",
+ "ruleName": "物料编码",
+ "tag": "JnpfInput",
+ "span": 8
+ },
+ "readonly": true,
+ "prop": "productCode",
+ "width": 0,
+ "__vModel__": "productCode",
+ "fixed": "none",
+ "style": {
+ "width": "100%"
+ },
+},
+
+{
+ "jnpfKey": "billRule",
+ "fullName": "销售合同",
+ "label": "销售合同",
+ "sortable": false,
+ "align": "left",
+ "__config__": {
+ "formId": 101,
+ "visibility": ["pc", "app"],
+ "jnpfKey": "billRule",
+ "defaultValue": null,
+ "noShow": false,
+ "tipLabel": "",
+ "dragDisabled": false,
+ "rule": "ssdj",
+ "className": [],
+ "label": "销售合同",
+ "trigger": "change",
+ "showLabel": true,
+ "required": false,
+ "tableName": "jg_voucher",
+ "renderKey": 1707042861597,
+ "layout": "colFormItem",
+ "tagIcon": "icon-ym icon-ym-generator-documents",
+ "ruleName": "物料编码",
+ "tag": "JnpfInput",
+ "span": 8
+ },
+ "readonly": true,
+ "prop": "saleContractNo",
+ "width": 0,
+ "__vModel__": "saleContractNo",
+ "fixed": "none",
+ "style": {
+ "width": "100%"
+ },
+},
+
+{
+ "jnpfKey": "billRule",
+ "fullName": "客户",
+ "label": "客户",
+ "sortable": false,
+ "align": "left",
+ "__config__": {
+ "formId": 101,
+ "visibility": ["pc", "app"],
+ "jnpfKey": "billRule",
+ "defaultValue": null,
+ "noShow": false,
+ "tipLabel": "",
+ "dragDisabled": false,
+ "rule": "ssdj",
+ "className": [],
+ "label": "客户",
+ "trigger": "change",
+ "showLabel": true,
+ "required": false,
+ "tableName": "jg_voucher",
+ "renderKey": 1707042861597,
+ "layout": "colFormItem",
+ "tagIcon": "icon-ym icon-ym-generator-documents",
+ "ruleName": "物料编码",
+ "tag": "JnpfInput",
+ "span": 8
+ },
+ "readonly": true,
+ "prop": "customerName1",
+ "width": 0,
+ "__vModel__": "customerName1",
+ "fixed": "none",
+ "style": {
+ "width": "100%"
+ },
+},
{
"jnpfKey": "billRule",