供应商主数据、采购信息记录 调整

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

@@ -52,10 +52,14 @@ function initItemGrid() {
                 if (Public.isNotBlank(editParma.record.matklName) && Public.isBlank(editParma.record.maktx) && editParma.column.name=='matnr'){
                     return false;
                 }
-
                   return true;
 
-            },
+            },onAfterEdit: function (editParma) {
+                if (editParma.column.name=='matnr' ){
+                    editParma.record.meinsName=editParma.record.bprmeName;
+                    editParma.record.meins=editParma.record.bprme;
+                }
+            }
         }
     );
     UICtrl.setSearchAreaToggle(itemGridManager);
@@ -146,11 +150,11 @@ function getGridColumns() {
                         EKGRP: "ekgrp",
                         EKNAM: "ekgrpName",
                         PEINH: "peinh",
-                        MEINS: "meins",
-                        MSEHL: "meinsName",
-                        //MEINS: "bprme",
-                        //MSEHL: "bprmeName",
-                    }
+                       // MEINS: "meins",
+                       // MSEHL: "meinsName",
+                        MEINS: "bprme",
+                        MSEHL: "bprmeName",
+                    },
                 },
             }
         },
@@ -234,7 +238,8 @@ function getGridColumns() {
                         return {fieldName: "MEINS"}
                     },
                     back: {
-                        MSEHI: "bprme",
+                      //  MSEHI: "bprme",
+                        MSEH3: "bprme",
                         MSEHL: "bprmeName",
                     }
                 },
@@ -243,22 +248,8 @@ function getGridColumns() {
         {display: "标准采购订单数量", name: "norbm", width: "120", align: "left", type: "string",
             editor: {type: 'text', mask: '9999999.99'}
         },
-        {display: "基本计量单位", name: "meinsName", width: "100", align: "left", type: "string",
-            editor: {
-                required: false, type: "select",
-                data: {
-                    type: 'system',
-                    name: "dictionary",
-                    getParam: function (item) {
-                        return {fieldName: "MEINS"}
-                    },
-                    back: {
-                        MSEHI: "meins",
-                        MSEHL: "meinsName",
-                    }
-                },
-            }
-        },
+        {display: "基本计量单位", name: "meinsName", width: "100", align: "left", type: "string"  },
+        {display: "基本计量单位", name: "meins", width: "40", align: "left", type: "string",hide:"true" },
         {display: "单位转换分母", name: "umren", width: "100", align: "left", type: "string",
             editor: {type: 'text', mask: '9999999.99'}
         },

topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordList.js

@@ -174,7 +174,7 @@ function updateHandler() {
 function addHandler() {
     UICtrl.addTabItem({
         tabid: 'addQualityInfoRecord',
-        text: '新增采购信息记录',
+        text: '新增质量信息记录',
         url: web_app.name + '/sapQualityInfoRecord/forwardSapQualityInfoRecordDetail.job'
     });
 }

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

@@ -74,13 +74,13 @@
             <x:inputC name="strSuppl4" label="街道5" labelCol="1" fieldCol="2" maxLength="35"/>
 
             <x:selectC name="langu" label="语言" labelCol="1" fieldCol="2" required="true" dictionary="langu"/>
-            <x:inputC name="smtpAddr" label="电子邮件地址" labelCol="1" fieldCol="2"/>
+            <x:inputC name="smtpAddr" label="电子邮件地址" labelCol="1" fieldCol="2" maxLength="30"/>
             <x:inputC name="postCode1" label="城市邮政编码" labelCol="1" fieldCol="2" required="true" maxLength="6"/>
             <x:inputC name="telNumber" label="电话" labelCol="1" fieldCol="2"/>
             <%--<x:inputC name="telExtens" label="第一个电话号码分机" labelCol="1" fieldCol="2"/>--%>
             <x:inputC name="mobNumber" label="移动电话" labelCol="1" fieldCol="2"/>
             <%--<x:inputC name="mobExtens" label="第一个移动电话号码分机" labelCol="1" fieldCol="2"/>--%>
-            <x:inputC name="faxNumber" label="传真" labelCol="1" fieldCol="2"/>
+            <x:inputC name="faxNumber" label="传真" labelCol="1" fieldCol="2" maxLength="30"/>
             <%--<x:inputC name="faxExtens" label="第一个传真号分机号" labelCol="1" fieldCol="2"/>--%>
              <!--x:selectC name="ktokk" label="供应商帐户组" labelCol="1" fieldCol="2" required="true" dictionary="buGroup"/-->
             <x:inputC name="kunnr" label="客户编号" labelCol="1" fieldCol="2"/>

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

@@ -281,6 +281,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         ClassHelper.copyProperties(baseInfo,sapVO);
         ClassHelper.copyProperties(applyDept,sapVO);
 
+        sapVO.setPstat(baseInfo.getBusinessUsage());
         sapVO.setUpdkz("I");
         if ("0".equals(sapVO.getInsmk())){
             sapVO.setInsmk("");

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

@@ -742,6 +742,11 @@ public class ProdApplyToSapVO {
     @JsonProperty("UPDKZ")
     private String updkz;
 
+    //业务视图
+    @JsonProperty("PSTAT")
+    private String pstat;
+
+
     @JsonProperty("TMARM")
     private List<Map<String,Object>> mapList;
 

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/application/impl/SapPurchaseInfoRecordApplicationImpl.java

@@ -113,7 +113,7 @@ public class SapPurchaseInfoRecordApplicationImpl extends FlowBroker implements
     }
 
     @Transactional
-    private void updateStatus(String bizId, BizBillStatus status) {
+    protected void updateStatus(String bizId, BizBillStatus status) {
         Assert.hasText(bizId, CommonDomainConstants.ID_NOT_BLANK);
         this.commonDomainService.updateStatus(SapPurchaseInfoRecord.class, bizId, status.getId());
     }
@@ -158,6 +158,8 @@ public class SapPurchaseInfoRecordApplicationImpl extends FlowBroker implements
                 List<SapResult> resultList = JSONObject.parseArray(execute, SapResult.class);
                 SapResult sapResult = resultList.get(0);
                 if (!"S".equals(sapResult.getTYPE())){
+                    resultMap.put("type", sapResult.getTYPE());
+                    resultMap.put("MESSAGE", "数据传输失败，"+ sapResult.getMESSAGE());
                     throw new RuntimeException("数据传输失败，"+ sapResult.getMESSAGE());
                 } else {
                     resultMap.put("type", sapResult.getTYPE());

topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapMaterialApplicationImpl.java

@@ -34,6 +34,12 @@ public class SapMaterialApplicationImpl implements SapMaterialApplication {
         /*if (StringUtil.isBlank(queryRequest.getWerks()) || StringUtil.isBlank(queryRequest.getMatkl())){
             return sapMaterialVoList;
         }*/
+        if  (queryRequest.getMaktx()==null){
+            queryRequest.setMaktx("");
+        }
+        if  (queryRequest.getMatkl()==null){
+            queryRequest.setMatkl("");
+        }
         String json = httpClient.execute(queryRequest, "search/sch_matnr");
         Map<String, Object> map = JSONUtil.toMap(json);
         SapResult sapResult = JSONObject.parseObject(JSONUtil.toString(map.get("MSG")), SapResult.class);

topsun/src/main/java/com/huigou/topsun/sap/sapApplication/domain/query/SapDialogQuery.java

@@ -12,4 +12,7 @@ public class SapDialogQuery {
     private String werks;
     private String maktx;
     private String matkl;
+
+
+
 }

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

@@ -364,10 +364,15 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("businessType", "供应商主数据");
         resultMap.put("businessId", suppliersInfo.getId());
-        resultMap.put("parameter", JSON.toJSONString(suppliersInfoVo));
         List<SuppliersInfoVo> suppliersInfoVos = new ArrayList<>();
         suppliersInfoVos.add(suppliersInfoVo);
         try {
+            String parameter=JSON.toJSONString(suppliersInfoVo);
+            parameter=parameter.replaceAll("suppliersPayList","LFB1");
+            parameter=parameter.replaceAll("suppliersBuyerList","LFM1");
+            parameter=parameter.replaceAll("suppliersBankList","BANK");
+           // parameter=com.huigou.topsun.util.CommonUtil.camelToUnderline(parameter);
+            resultMap.put("parameter", parameter);
             String result = defaultHttpClient.execute(suppliersInfoVos, url);
             List<SapResult> sapResultList = JSONObject.parseArray(result, SapResult.class);
             if (sapResultList.size()<1){

topsun/src/main/resources/config/content/easysearch/easy-search-suppliers.xml

@@ -11,7 +11,7 @@
             sap_suppliers_info  t
             WHERE t.status = 3 and t.partner not in (select partner from sap_suppliers_info t where t.apply_type = -1)
         </sql>
-        <field name="供应商编码" title="供应商编码" code="partner" width="200"/>
+        <field name="供应商编码" title="供应商编码" code="partner" width="100"/>
         <field name="供应商名称" title="供应商名称" code="nameOrg1" width="200"/>
         <condition column="name_org1" name="nameOrg1" symbol="like" alias="t"/>
     </easy-search>