采购视图库存地点必输；供应商问题修改

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

@@ -350,7 +350,7 @@ function distributeForm() {
             return false;
         }
     }
-    if (hasWarehouseView||hasStoreView || hasMRPView) {
+    if (hasPurchaseView||hasWarehouseView||hasStoreView || hasMRPView) {
         if ($("#lgort").val() == "") {
             Public.tip("库存地点必输！");
             return false;

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js

@@ -327,19 +327,19 @@ function loadSuppliersPayListGrid() {
                 display: "检查双重发票", name: "reprf", width: 160, minWidth: 60, type: "String", align: "left",
                 //editor: {type: 'text', required: true}
             },
-            {
-                display: "中心记帐冻结", name: "sperrTextView", width: 100, minWidth: 60, type: "String", align: "left",
-                editor: {
-                    type: 'dictionary',
-                    data: {name: 'sperr'},
-                    textField: 'sperrTextView',
-                    valueField: 'sperr',
-                    required: false,
-                    render: function (item) {
-                        return item.sperrTextView;
-                    }
-                }
-            },
+            // {
+            //     display: "中心记帐冻结", name: "sperrTextView", width: 100, minWidth: 60, type: "String", align: "left",
+            //     editor: {
+            //         type: 'dictionary',
+            //         data: {name: 'sperr'},
+            //         textField: 'sperrTextView',
+            //         valueField: 'sperr',
+            //         required: false,
+            //         render: function (item) {
+            //             return item.sperrTextView;
+            //         }
+            //     }
+            // },
             {
                 display: "对公司代码过帐冻结", name: "sperrBTextView", width: 140, minWidth: 60, type: "String", align: "left",
                 editor: {

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.jsp

@@ -102,7 +102,7 @@
     <x:title title="供应商公司信息" name="group"/>
     <div id="sapSuppliersPayGrid" style="margin: 2px;"></div>
     <div class="blank_div clearfix"></div>
-    <x:title title="供应商银行银行信息" name="group"/>
+    <x:title title="供应商银行信息" name="group"/>
     <div id="sapSuppliersBankGrid" style="margin: 2px;"></div>
 </form>
 </body>

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersExtendDataDetail.js

@@ -310,19 +310,19 @@ function loadSuppliersPayListGrid() {
                 display: "检查双重发票", name: "reprf", width: 160, minWidth: 60, type: "String", align: "left",
                 //editor: {type: 'text', required: true}
             },
-            {
-                display: "中心记帐冻结", name: "sperrTextView", width: 100, minWidth: 60, type: "String", align: "left",
-                editor: {
-                    type: 'dictionary',
-                    data: {name: 'sperr'},
-                    textField: 'sperrTextView',
-                    valueField: 'sperr',
-                    required: false,
-                    render: function (item) {
-                        return item.sperrTextView;
-                    }
-                }
-            },
+            // {
+            //     display: "中心记帐冻结", name: "sperrTextView", width: 100, minWidth: 60, type: "String", align: "left",
+            //     editor: {
+            //         type: 'dictionary',
+            //         data: {name: 'sperr'},
+            //         textField: 'sperrTextView',
+            //         valueField: 'sperr',
+            //         required: false,
+            //         render: function (item) {
+            //             return item.sperrTextView;
+            //         }
+            //     }
+            // },
             {
                 display: "对公司代码过帐冻结", name: "sperrBTextView", width: 140, minWidth: 60, type: "String", align: "left",
                 editor: {

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersExtendDataDetail.jsp

@@ -94,7 +94,7 @@
     <x:title title="供应商公司信息" name="group"/>
     <div id="sapSuppliersPayGrid" style="margin: 2px;"></div>
     <div class="blank_div clearfix"></div>
-    <x:title title="供应商银行银行信息" name="group"/>
+    <x:title title="供应商银行信息" name="group"/>
     <div id="sapSuppliersBankGrid" style="margin: 2px;"></div>
 </form>
 </body>

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

@@ -369,7 +369,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         if (baseInfo.getBusinessUsage().contains("K")){
             sapVO.setPstat(baseInfo.getBusinessUsage());
         }else {
-            sapVO.setPstat("K"+baseInfo.getBusinessUsage());
+            sapVO.setPstat("K,"+baseInfo.getBusinessUsage());
         }
         sapVO.setUpdkz("I");
         if ("0".equals(sapVO.getInsmk())){
@@ -418,9 +418,9 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
             List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() {
             });
             Map<String, Object>  returnMap = resultList.get(0);
-            if ("S".equals(returnMap.get("TYPE"))){
-                returnMap = resultList.get(1);
-            }
+//            if ("S".equals(returnMap.get("TYPE"))){
+//                returnMap = resultList.get(1);
+//            }
             mapCopy(backMap,returnMap);
             // resultMap.put("businessType", busiType);
             // resultMap.put("parameter", JSON.toJSONString(map));

topsun/src/main/java/com/huigou/topsun/sap/suppliers/controller/SuppliersDataController.java

@@ -2,16 +2,8 @@ package com.huigou.topsun.sap.suppliers.controller;
 
 import com.huigou.context.Operator;
 import com.huigou.context.OrgUnit;
-import com.huigou.topsun.base.bsnMessage.domain.BsnMessageReject;
-import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyApplication;
-import com.huigou.topsun.sap.nonProdApply.domain.NonProdApplyBaseInfo;
-import com.huigou.topsun.sap.nonProdApply.domain.query.NonProdApplyBaseInfoQueryRequest;
-import com.huigou.topsun.sap.priceMasterData.domain.query.SapPriceMasterDataItemQueryRequest;
 import com.huigou.topsun.sap.suppliers.application.SuppliersDataApplication;
-import com.huigou.topsun.sap.suppliers.domain.SuppliersBank;
-import com.huigou.topsun.sap.suppliers.domain.SuppliersBuyer;
 import com.huigou.topsun.sap.suppliers.domain.SuppliersInfo;
-import com.huigou.topsun.sap.suppliers.domain.SuppliersPay;
 import com.huigou.topsun.sap.suppliers.domain.query.SuppliersBankQueryRequest;
 import com.huigou.topsun.sap.suppliers.domain.query.SuppliersBuyerQueryRequest;
 import com.huigou.topsun.sap.suppliers.domain.query.SuppliersDataQueryRequest;

topsun/src/main/java/com/huigou/topsun/sap/suppliers/domain/query/SuppliersBankQueryRequest.java

@@ -3,15 +3,16 @@ package com.huigou.topsun.sap.suppliers.domain.query;
 import com.huigou.data.domain.query.QueryAbstractRequest;
 import lombok.Data;
 
+/**
+ * @Auther: xin.lu
+ * @Date: 2024/07/16/14:48
+ * @Description:
+ */
 @Data
 public class SuppliersBankQueryRequest extends QueryAbstractRequest {
-
     /**
      * sId
      */
     private String sId;
 
-
-
-
 }