物料主数据增加导出功能；物料申请页面增加生反面图片上传，并能带到物料维护页面

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js

@@ -68,6 +68,7 @@ function loadNonProdApplyListGrid() {
             }
         },
         impExcelDataHandler:{id:'impExcelData',img:'fa-table',text:'导入数据',click:impExcelDataHandler},
+        exportExcelHandler:exportExcelHandler,
         unfreezeHandler: {id: 'unfreeze', text: '解冻', img: 'fa-map', className: 'btn-gray',
             click: function () {
                 let results = gridManager.getSelectedRows();
@@ -129,7 +130,7 @@ function loadNonProdApplyListGrid() {
             {display: "SAP物料名称", name: "maktx", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "物料要求描述", name: "maktxRemZh", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "适用标准(国标)", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
-            {display: "基本计量单位", name: "baseUnitTextView", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "基本计量单位", name: "meinsName", width: 80, minWidth: 60, type: "string", align: "left"},
             {display: "规格", name: "specifications", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "材质", name: "material", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "版式", name: "design", width: 140, minWidth: 60, type: "string", align: "left"},
@@ -299,6 +300,11 @@ function impExcelDataHandler(){
         reloadGrid();
     });
 }
+//导出Excel
+function exportExcelHandler() {
+    var date = Public.formatDate(new Date(),`%Y%M%D`);
+    UICtrl.gridExport(gridManager,{fileName:"物料主数据"+date});
+}
 
 // function next(){
 //     UICtrl.addTabItem({

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java

@@ -286,17 +286,20 @@ public class NonProdApplyController extends CommonController {
             }
             this.putAttribute("businessUsageUnSeledList",unMapTmp);
         }
-        List<Attachment> frontAttachments = attachmentApplication.queryAttachments("frontPicture", nonProdApplyBaseInfo.getAttbizId());
-        List<Attachment> backAttachments = attachmentApplication.queryAttachments("backPicture", nonProdApplyBaseInfo.getAttbizId());
+        if (StringUtil.isNotBlank(nonProdApplyBaseInfo.getAttbizId())){
+            List<Attachment> frontAttachments = attachmentApplication.queryAttachments("frontPicture", nonProdApplyBaseInfo.getAttbizId());
+            List<Attachment> backAttachments = attachmentApplication.queryAttachments("backPicture", nonProdApplyBaseInfo.getAttbizId());
 
-        if (frontAttachments.size() > 0) {
-            Attachment attachment = frontAttachments.get(0);
-            this.putAttribute("frontPicturePath", StringUtil.encode(attachment.getPath()));
-        }
-        if (backAttachments.size() > 0) {
-            Attachment attachment = backAttachments.get(0);
-            this.putAttribute("backPicturePath", StringUtil.encode(attachment.getPath()));
+            if (frontAttachments.size() > 0) {
+                Attachment attachment = frontAttachments.get(0);
+                this.putAttribute("frontPicturePath", StringUtil.encode(attachment.getPath()));
+            }
+            if (backAttachments.size() > 0) {
+                Attachment attachment = backAttachments.get(0);
+                this.putAttribute("backPicturePath", StringUtil.encode(attachment.getPath()));
+            }
         }
+
         Map <String,String>dictMapUsage=DictUtil.getDictionary("serviceusage");
         String dictMapUsages="";
         for (Map.Entry<String, String> entry: dictMapUsage.entrySet()) {

topsun/src/main/resources/config/topsun/sap/nonProdApply/nonProdApplyBaseInfo.xml

@@ -2,7 +2,7 @@
 <query-mappings>
     <query name="slicedNonProdApplyBaseInfoQuery" table="sap_non_prod_apply_base_info">
         <sql-query>
-            select t.*,ad.matnr,ad.status as dept_status,ad.maktx,ad.werks,ad.werks_name,ad.mtart  from sap_non_prod_apply_base_info t left join sap_non_prod_apply_dept ad on t.id  = ad.base_info_id where 1=1
+            select t.*,ad.matnr,ad.status as dept_status,ad.maktx,ad.werks,ad.werks_name,ad.mtart,ad.meins_name  from sap_non_prod_apply_base_info t left join sap_non_prod_apply_dept ad on t.id  = ad.base_info_id where 1=1
         </sql-query>
         <condition column="matnr" name="matnr" type="java.lang.String" symbol="like" alias="ad"/>
         <condition column="status" name="status" type="java.lang.String" symbol="in" alias="t"/>