客供料查询时，根据物料编码查询对应的客户名称

topsun-xt/src/main/webapp/biz/topsun/sap/clientMaterials/clientMaterialsList.js

@@ -30,6 +30,7 @@ function loadGrid() {
             {display: "行项次", name: "kdpos", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "跟单员", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "生产订单", name: "aufnr", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "客户名称", name: "kunnrName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "是否完成", name: "closedTextView", width: 100, minWidth: 60, type: "string", align: "left"},
         ],
         dataAction: "server",

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/application/impl/ClientMaterialsApplicationImpl.java

@@ -25,6 +25,7 @@ import com.huigou.topsun.sap.clientMaterials.vo.ClientMaterialsQueryRequestVo;
 import com.huigou.topsun.sap.clientMaterials.vo.ClientMaterialsVo;
 import com.huigou.topsun.sap.common.HttpClient;
 import com.huigou.topsun.sap.common.domain.SapResult;
+import com.huigou.topsun.sap.nonProdApply.application.NonProdApplyDeptApplication;
 import com.huigou.topsun.util.SAPUtils;
 import com.huigou.uasp.bmp.common.application.BaseApplication;
 import com.huigou.uasp.bmp.opm.application.OrgApplication;
@@ -56,6 +57,8 @@ public class ClientMaterialsApplicationImpl extends BaseApplication implements C
     private OrgApplication orgApplication;
     @Autowired
     BsnMessageApplication bsnMessageApplication;
+    @Autowired
+    private NonProdApplyDeptApplication nonProdApplyDeptApplication;
 
 
     @Override
@@ -140,6 +143,12 @@ public class ClientMaterialsApplicationImpl extends BaseApplication implements C
                     map.put("id",org.getPerson().getId());
                     personMaps.add(map);
                 }
+
+                //根据物料编码查询客户名称
+                if (StringUtils.isNotBlank(clientMaterialsVo.getMatnr())){
+                    String kunnrName = nonProdApplyDeptApplication.queryKunnrNameByMatnr(clientMaterialsVo.getMatnr());
+                    clientMaterialsDb.setKunnrName(kunnrName);
+                }
                 clientMaterialsRepository.save(clientMaterialsDb);
 
                 //推送待办任务
@@ -148,6 +157,11 @@ public class ClientMaterialsApplicationImpl extends BaseApplication implements C
                 ClientMaterials clientMaterialsDb = clientMaterialsDbs.get(0);
                 //不为空，更新数据
                 BeanUtil.copyProperties(clientMaterialsVo,clientMaterialsDb);
+                //根据物料编码查询客户名称
+                if (StringUtils.isNotBlank(clientMaterialsVo.getMatnr()) && StringUtil.isBlank(clientMaterialsDb.getKunnrName())){
+                    String kunnrName = nonProdApplyDeptApplication.queryKunnrNameByMatnr(clientMaterialsVo.getMatnr());
+                    clientMaterialsDb.setKunnrName(kunnrName);
+                }
                 clientMaterialsRepository.save(clientMaterialsDb);
             }
         }

topsun/src/main/java/com/huigou/topsun/sap/clientMaterials/domain/ClientMaterials.java

@@ -135,4 +135,10 @@ public class ClientMaterials extends AbstractEntity {
     @Column(name = "delete_person_member_name")
     private String deletePersonMemberName;
 
+    /**
+     * 客户名称
+     */
+    @Column(name = "kunnr_name")
+    private String kunnrName;
+
 }

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyDeptApplication.java

@@ -14,7 +14,7 @@ public interface NonProdApplyDeptApplication {
 
 
 
-    String QUERY_XML_FILE_PATH="config/topsun/sap/nonProdApply/nonProdApplyDept.xml";
+    String QUERY_XML_FILE_PATH="config/topsun/sap/nonProdApply/nonProdApplyBaseInfo.xml";
 
 
     /**
@@ -51,4 +51,11 @@ public interface NonProdApplyDeptApplication {
 
     //冻结或解冻物料状态
     void unfreezeMaterialStatus(List<String> ids);
+
+    /**
+     * 根据物料编码查询客户名称
+     * @param matnr
+     * @return
+     */
+    String queryKunnrNameByMatnr(String matnr);
 }
\ No newline at end of file

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

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.huigou.context.Operator;
+import com.huigou.data.query.model.QueryDescriptor;
 import com.huigou.topsun.base.bsnMessage.appliction.BsnMessageApplication;
 import com.huigou.topsun.base.bsnMessage.domain.*;
 import com.huigou.topsun.base.bsnMessage.repository.BsnMessageSponsorRepository;
@@ -552,4 +553,11 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         }
     }
 
+    @Override
+    public String queryKunnrNameByMatnr(String matnr) {
+        QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryKunnrNameByMatnr");
+        String kunnrName = this.sqlExecutorDao.queryToString(queryDescriptor.getSql(), matnr);
+        return kunnrName;
+    }
+
 }

topsun/src/main/resources/config/topsun/sap/nonProdApply/nonProdApplyBaseInfo.xml

@@ -29,4 +29,12 @@
         </sql-query>
         <!--condition column="matnr" name="matnr" type="java.lang.String" symbol="=" alias="t"/-->
     </query>
+
+    <query name="queryKunnrNameByMatnr" label="根据物料编码查询客户名称" table="sap_non_prod_apply_base_info">
+        <sql-query>
+            SELECT d.kunnr_name
+             FROM sap_non_prod_apply_dept d LEFT JOIN sap_non_prod_apply_base_info b ON d.base_info_id = b.id
+             WHERE b.distribute = '2' and d.MATNR = ? ORDER BY fillin_date desc limit 1
+        </sql-query>
+    </query>
 </query-mappings>
\ No newline at end of file