采购申请优化；质量信息记录优化

huigou-xt/src/main/webapp/lib/jquery/jquery.combox.js

@@ -1576,6 +1576,9 @@
 					opts.onChange.call(this,values,{});
 				}
 			}
+			if($.isFunction(opts.beforeChange)){//原始数据作为参数回调
+				opts.beforeChange.call(this,values)
+			}
 			if(opts.checkbox&&this.selectDataMap){
 				this.selectDataMap.clear();
 			}

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/controller/SapPurchaseApprovalController.java

@@ -48,12 +48,14 @@ public class SapPurchaseApprovalController extends CommonController {
         HashMap<String, Object> messageMap = new HashMap<>();
         messageMap.put("Message_Status","S");
         messageMap.put("Message_Text","成功");
+        messageMap.put("NUMBER",sapPurchaseApprovalDto.getLsDeader().getBanfn());
         LOG.info("SAP采购申请审批数据=={}",sapPurchaseApprovalDto);
         try {
             this.sapPurchaseApprovalApplication.saveSapPurchaseApprovalVo(sapPurchaseApprovalDto);
         }catch (RuntimeException e){
             messageMap.put("Message_Status","E");
             messageMap.put("Message_Text",e);
+            messageMap.put("NUMBER",sapPurchaseApprovalDto.getLsDeader().getBanfn());
         }
         return messageMap;
     }

topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/application/impl/SapQualityInfoRecordApplicationImpl.java

@@ -154,9 +154,15 @@ public class SapQualityInfoRecordApplicationImpl extends FlowBroker implements S
         purchaseInfoRecordItemList.forEach(sapQualityInfoRecordItem -> {
             SapQualityInfoRecordItemVo sapQualityInfoRecordItemVo = new SapQualityInfoRecordItemVo();
             BeanUtil.copyProperties(sapQualityInfoRecordItem, sapQualityInfoRecordItemVo);
-            sapQualityInfoRecordItem.setZqavfn3("M1");
-            sapQualityInfoRecordItem.setZvfnc3("A");
-            sapQualityInfoRecordItem.setZqafst("11");
+//            sapQualityInfoRecordItem.setZqavfn3("M1");
+//            sapQualityInfoRecordItem.setZvfnc3("A");
+//            sapQualityInfoRecordItem.setZqafst("11");
+            if ("0".equals(sapQualityInfoRecordItemVo.getGrsrq())){
+                sapQualityInfoRecordItemVo.setGrsrq("");
+            }
+            if ("0".equals(sapQualityInfoRecordItemVo.getFscrq())){
+                sapQualityInfoRecordItemVo.setFscrq("");
+            }
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
             if (sapQualityInfoRecordItem.getGrscertdatai() !=null){
                 String datab = dateFormat.format(sapQualityInfoRecordItem.getGrscertdatai());

topsun/src/main/java/com/huigou/topsun/sap/suppliers/application/impl/SuppliersDataApplicationImpl.java

@@ -11,6 +11,7 @@ import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.data.query.model.QueryModel;
 import com.huigou.topsun.sap.common.DefaultHttpClient;
 import com.huigou.topsun.sap.common.application.SapMutualEpLogApplication;
+import com.huigou.topsun.sap.common.domain.SapResult;
 import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement;
 import com.huigou.topsun.sap.suppliers.application.SuppliersDataApplication;
 import com.huigou.topsun.sap.suppliers.domain.*;
@@ -353,16 +354,16 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
         suppliersInfoVos.add(suppliersInfoVo);
         try {
             String result = defaultHttpClient.execute(suppliersInfoVos, url);
-            List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() {
+            List<SapResult> sapResultList = objectMapper.readValue(result, new TypeReference<List<SapResult>>() {
             });
-            resultMap = resultList.get(0);
+            SapResult sapResult = sapResultList.get(0);
             resultMap.put("sequence", resultMap.get("row"));
             sapMutualEpLogApplication.saveSapMutualEpLog(resultMap);
-            if ("S".equals(resultMap.get("TYPE"))) {
-                suppliersInfo.setPartner((String) resultMap.get("MESSAGE_V1"));
+            if ("S".equals(sapResult.getTYPE())) {
+                suppliersInfo.setPartner(sapResult.getMESSAGE_V1());
                 suppliersInfoRepository.save(suppliersInfo);
             } else {
-                throw new RuntimeException("数据传输失败，请稍后手动重试！" + resultMap.get("MESSAGE"));
+                throw new RuntimeException("数据传输失败，请稍后手动重试！" + sapResult.getMESSAGE());
             }
         } catch (Exception e) {
             resultMap.put("type", "E");