物料信息增加推送SAP前的校验

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

@@ -44,6 +44,11 @@ function initializate() {
           financialDisplayNcost($("#vprsv").val());
        }
     });
+    //仓库设施1类型 控制 仓库设施1存储数量和单位的必填
+    $("#lety1").combox({onChange:function(data) {
+           warehouseSet(data.value);
+        }
+    });
     switch ($("#active").val()) {
         case '0'://待填报
           //  $("#businessUsageDiv").hide();
@@ -462,10 +467,27 @@ function  warehouseMustInput(flag) {
     UICtrl.setElRequiredFlag("#ltkzeName",flag);
     UICtrl.setElRequiredFlag("#lgortProfitName",flag);
    // UICtrl.setElRequiredFlag("#lhmg1",flag);
-    UICtrl.setElRequiredFlag("#lhme1Name",flag);
+   // UICtrl.setElRequiredFlag("#lhme1Name",flag);
     UICtrl.setElRequiredFlag("#lgnumName",flag);
     UICtrl.setElRequiredFlag("#lgortName",flag);
     lgortMustInput();
+    if (!flag){
+        $('#lety1').val("");
+        $('#lety1_text').val("");
+    }
+    warehouseSet($('#lety1').val());
+}
+
+function warehouseSet(val){
+    if (val=="TP"){
+        UICtrl.setElRequiredFlag("#lhme1Name",true);
+        UICtrl.setElRequiredFlag("#lhmg1",true);
+     } else {
+        UICtrl.setElRequiredFlag("#lhme1Name",false);
+        UICtrl.setElRequiredFlag("#lhmg1",false);
+        $('#lhmg1').val("");
+    }
+
 }
 function  financialMustInput(flag) {
     UICtrl.setElRequiredFlag("#bklas",flag);
@@ -551,7 +573,7 @@ function saveForm(status) {
              if (status==1) {
                $("#buttonBox").remove();
               }
-            _self.close();
+           // _self.close();
             UICtrl.reloadTabById('homepage');
         }
     });
@@ -1189,7 +1211,7 @@ function bindEvent_mrp(){
 }
 
 function bindEvent_warehouse(){
-    $("#lety1").val("TP");
+   // $("#lety1").val("TP");
     //库存地点
     $('#lgortProfitName').searchbox({
         type: "system", name: "dictionary",

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

@@ -341,7 +341,7 @@
 
                         <x:inputC name="ltkzaName" label="存货下架存储类型" labelCol="2" fieldCol="2" required="false" wrapper="select"/>
                         <x:hidden name="ltkza"/>
-                        <x:inputC name="lety1" label="仓库设施1类型" labelCol="1" fieldCol="1" required="false" readonly="true"/>
+                        <x:selectC name="lety1" label="仓库设施1类型" labelCol="1" fieldCol="1" required="false" dictionary="lety1"/>
                         <x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="2" fieldCol="1" required="false" mask="99999999"/>
 
                         <x:inputC name="lhme1Name" label="仓库设施1存储单位" labelCol="2" fieldCol="1" required="false" wrapper="select"/>

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

@@ -213,22 +213,29 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         }  */
         //不是分发的  提交后产生领导的待办信息
         if (StringUtil.isBlank(businessCode)&&active ==1&&StringUtil.isBlank(sdo.getString("distribute"))){ //基本信息提交后  发送待分发的待办消息
-            //先结束 基本信息的待办
-            BsnMessageSponsor bsnMessageSponsor2=bsnMessageSponsorRepository.findByBusinessId(baseInfo.getId());
-            if (bsnMessageSponsor2!=null){
-                List<BsnMessageExecute> bsnMsgList2 = bsnMessageExecuteRepository.findAllByMessageSponsorId(bsnMessageSponsor2.getId());
-                for (BsnMessageExecute bsnMessageExecute : bsnMsgList2) {
-                    if ("HYZY".equals(bsnMessageExecute.getBusinessCode())) {
-                        bsnMessageApplication.submitTask(bsnMessageExecute.getId());
-                    }
-                }
-            }
-            //产生领导确认的待办信息
-            Map backMap=new HashMap();
-            backMap.put("TYPE","D");
-            backMap.put("title",nonProdApplyDept.getMaktx()); //汉语品名
-            backMap.put("positionCode","LDQR");
-            saveBsnMessageData(baseInfo,backMap);
+           //调用SAP进行校验
+            baseInfo.setCheckFlag("X");
+            String  backStr=sendSapMaterialData(baseInfo,nonProdApplyDept);
+           if (StringUtil.isNotBlank(backStr)) {
+               throw new RuntimeException(backStr);
+           }else {
+               //先结束 基本信息的待办
+               BsnMessageSponsor bsnMessageSponsor2 = bsnMessageSponsorRepository.findByBusinessId(baseInfo.getId());
+               if (bsnMessageSponsor2 != null) {
+                   List<BsnMessageExecute> bsnMsgList2 = bsnMessageExecuteRepository.findAllByMessageSponsorId(bsnMessageSponsor2.getId());
+                   for (BsnMessageExecute bsnMessageExecute : bsnMsgList2) {
+                       if ("HYZY".equals(bsnMessageExecute.getBusinessCode())) {
+                           bsnMessageApplication.submitTask(bsnMessageExecute.getId());
+                       }
+                   }
+               }
+               //产生领导确认的待办信息
+               Map backMap = new HashMap();
+               backMap.put("TYPE", "D");
+               backMap.put("title", nonProdApplyDept.getMaktx()); //汉语品名
+               backMap.put("positionCode", "LDQR");
+               saveBsnMessageData(baseInfo, backMap);
+           }
         }
       /*  if (active!=null&&active == 2&&opstatus.equals("1")){//各部门都提交后，隐藏消息
             bsnMessageApplication.submitTask(meId);
@@ -390,7 +397,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
     /**
      * 远程调用sap接口，传递数据
      */
-    public String sendSapData(NonProdApplyBaseInfo baseInfo,SapNonProdApplyDept applyDept) {
+    public String sendSapMaterialData(NonProdApplyBaseInfo baseInfo,SapNonProdApplyDept applyDept) {
         Map<String, Object> map = new HashMap<>();
         String backStr="";
         ProdApplyToSapVO sapVO=new ProdApplyToSapVO();
@@ -486,9 +493,11 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
                 if (!"product".equals(baseInfo.getKind())) {
                     applyDept.setMatnr((String) backMap.get("MESSAGE_V1"));
                 }
-                this.nonProdApplyDeptRepository.save(applyDept);
-                baseInfo.setDistribute(2); //已办结
-                nonProdApplyBaseInfoRepository.save(baseInfo);
+                if (StringUtil.isBlank(baseInfo.getCheckFlag())) { //非校验
+                    this.nonProdApplyDeptRepository.save(applyDept);
+                    baseInfo.setDistribute(2); //已办结
+                    nonProdApplyBaseInfoRepository.save(baseInfo);
+                }
             } else {
                 //更改到到提交状态
                 baseInfo.setDistribute(0);
@@ -515,8 +524,9 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
             //向货源专员 发重新分发的消息
              backMap.put("title",applyDept.getMaktx());//汉语品名
              backMap.put("positionCode","HYZY");
-             saveBsnMessageData(baseInfo,backMap);
-
+             if (StringUtil.isBlank(baseInfo.getCheckFlag())) {
+                 saveBsnMessageData(baseInfo, backMap);
+             }
             return backStr;
         }
 
@@ -628,7 +638,8 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         SapNonProdApplyDept nonProdApplyDept=nonProdApplyDeptRepository.findByBaseInfoId(sdo.getId());
         if ("2".equals(confirm)){//确认
             // 推送SAP
-            String backStr=sendSapData(baseInfo,nonProdApplyDept);
+            baseInfo.setCheckFlag("");
+            String backStr=sendSapMaterialData(baseInfo,nonProdApplyDept);
             map.put("result",backStr);
         } else { //回退给货源专员
             //产生货源专员的待办信息

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

@@ -251,7 +251,7 @@ public class NonProdApplyNextController extends CommonController {
     }
 
     /**
-     * 填写收到的任务表单
+     * 各业务部门填写收到的任务表单 （不用了）
      *
      * @return
      */

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/NonProdApplyBaseInfo.java

@@ -164,6 +164,11 @@ public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
     private String applyDeptId;
     @Transient
     private String matnr;
+
+    //CHECK_FLAG，检查标识（传 'X'：检查，空：创建
+    @Transient
+    private String checkFlag;
+
     /**
      * 扩展时显示已选择的业务用途
      */

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/ProdApplyToSapVO.java

@@ -806,6 +806,10 @@ public class ProdApplyToSapVO {
     @JsonProperty("MAKTX_REM_EN")
     private String maktxRemEn;
 
+    //CHECK_FLAG，检查标识（传 'X'：检查，空：创建
+    @JsonProperty("CHECK_FLAG")
+    private String checkFlag;
+
     @JsonProperty("TMARM")
     private List<Map<String,Object>> mapList;