物料创建失败也保存填写的数据

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

@@ -241,21 +241,20 @@ function saveForm(status) {
         url: web_app.name + '/sapNonProdApplyNext/saveSapNonProdApplyDept.ajax',
         //param: extendedData,
         success: function (data) {
-            //$("#applyDeptId").val(data.applyDeptId);
+            $("#applyDeptId").val(data.applyDeptId);
             if (status == 1){
                 $("#matnr").val(data.matnr);
             }
-             if (data.result=="")
-             {
+             if (data.type=="S") {
                Public.successTip("保存成功！");
              } else {
-               Public.tip(data.result);
+               Public.tip(data.backStr);
              }
-             if (status==1) {
+            if (status==1 && data.type=="S") {
                 $("#buttonBox").remove();
             }
            // _self.close();
-            UICtrl.reloadTabById('homepage');
+            UICtrl.reloadTabById('#homepage');
         }
     });
 }

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

@@ -602,17 +602,16 @@ function saveForm(status) {
         //param: extendedData,
         success: function (data) {
             $("#applyDeptId").val(data.applyDeptId);
-             if (data.result=="")
-             {
+             if (data.type=="S") {
                Public.successTip("保存成功！");
              } else {
-               Public.tip(data.result);
+               Public.tip(data.backStr);
              }
-             if (status==1) {
+             if (status==1 && data.type=="S") {
                $("#buttonBox").remove();
               }
            // _self.close();
-            UICtrl.reloadTabById('homepage');
+            UICtrl.reloadTabById('#homepage');
         }
     });
 }
@@ -1373,7 +1372,10 @@ function bindEvent_sale() {
     $('#vtwegName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {
-            return {fieldName: "VTWEG"}
+            return {
+                fieldName: "VTWEG",
+                filterValue: $('#vkorg').val()
+            }
         },
         onChange: function (value, data) {
             $('#vtweg').val(data.VTWEG);

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java

@@ -149,13 +149,17 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         }
         ClassHelper.copyProperties(deptVo,nonProdApplyDept);
 
-        //nonProdApplyDept = this.save(nonProdApplyDept);
+        nonProdApplyDept = this.save(nonProdApplyDept);
+        map.put("applyDeptId",nonProdApplyDept.getApplyDeptId());
+        map.put("type","S");
         //不是分发的  提交后产生领导的待办信息
         if (StringUtil.isBlank(businessCode)&&active ==1&&StringUtil.isBlank(sdo.getString("distribute"))){ //基本信息提交后  发送待分发的待办消息
            //调用SAP进行校验
             //baseInfo.setCheckFlag("X");
             Map<String, Object> data = sendSapMaterialData2(baseInfo, nonProdApplyDept);
             map.put("matnr",data.get("matnr"));
+            map.put("type",data.get("TYPE"));
+            map.put("backStr",data.get("backStr"));
             return map;
         }
         return map;
@@ -579,6 +583,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
             });
             Map<String, Object>  returnMap = resultList.get(0);
             mapCopy(backMap,returnMap);
+            map.put("TYPE", returnMap.get("TYPE"));
             if ("S".equals(returnMap.get("TYPE"))) {
                 backMap.put("TYPE", "S");
                 backMap.put("MESSAGE",applyDept.getMatnr()+":"+backMap.get("MESSAGE"));
@@ -613,8 +618,6 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
                 errorMsg = String.join("；",messages);
                 backStr="传输失败:" + errorMsg;
                 backMap.put("MESSAGE",backStr);
-                //nonProdApplyBaseInfoRepository.save(baseInfo);
-                throw new RuntimeException(backStr);
             }
         } catch (Exception e) {
 //            backMap.put("MESSAGE",applyDept.getMatnr()+":"+errorMsg);