采购信息记录默认有效日期起止；审批选项改为同意/不同意；采购申请审批，采购订单审批，回退标识不通过

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp

@@ -58,7 +58,7 @@
     <x:title title="维护物品总体内容" name="group"/>
     <div class="hg-form-cols">
         <div class="hg-form-row">
-            <x:inputC name="genericName" label="通用品名" required="true" labelCol="1" fieldCol="5"/>
+            <x:inputC name="genericName" label="通用品名" required="false" labelCol="1" fieldCol="5"/>
             <x:inputC name="matnr" label="物料编号" labelCol="1" fieldCol="2"/>
           <c:if test="${kind=='product'}">
             <x:inputC name="applicableStandard" label="适用标准(国标)" labelCol="1" fieldCol="2"/>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js

@@ -546,6 +546,12 @@ function getGridData(){
 }
 
 function initShowDialog() {
+    if ($("#datab").val() == null || $("#datab").val() == ''){
+        $("#datab").val($("#fillinDate").val().substring(0,10));
+    }
+    if ($("#datbi").val() == null || $("#datbi").val() == ''){
+        $("#datbi").val('9999-12-31');
+    }
     // var mainFileTable = $('#compensateLibraryList').fileList();
     // mainFileTable.find('table').css({
     //     borderTopWidth: 0

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java

@@ -215,7 +215,7 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
             SapPurchaseApproval sapPurchaseApproval = sapPurchaseApprovalRepository.findOne(bizId);
             sapPurchaseApproval.setStatusId(BizBillStatus.APPLYING.getId());
             sapPurchaseApprovalRepository.save(sapPurchaseApproval);
-            //sendSapData(sapPurchaseApproval,"N");
+            sendSapData(sapPurchaseApproval,"N");
             //终止
             //workflowApplication.abortProcessInstance(delegateTask.getProcessInstanceId());
         }

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java

@@ -253,7 +253,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
             SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderRepository.findOne(bizId);
             sapPurchaseOrder.setStatusId(BizBillStatus.APPLYING.getId());
             SapPurchaseOrder save = sapPurchaseOrderRepository.save(sapPurchaseOrder);
-            //this.sendSapDate(save, "N");
+            this.sendSapDate(save, "N");
             // 调用 onEnd 方法
 //            DelegateExecution execution = delegateTask.getExecution();
 //            onEnd(execution);