diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index ff008b0..38abb53 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -81,6 +81,18 @@
0.9.1.2
+
+
+ org.json
+ json
+ 20180813
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.1
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java
index bd91c14..cc08f8b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/CustomerController.java
@@ -1,7 +1,18 @@
package com.ruoyi.web.controller.customer;
+import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.customer.domain.qcc.FuzzySearch;
+import com.ruoyi.customer.domain.qcc.QccFuzzySearchJsonResult;
+import com.ruoyi.web.utils.IdUtils;
+import com.ruoyi.web.utils.qcc.HttpHelper;
+import com.ruoyi.web.utils.qcc.QiChaChaUtil;
+import org.apache.http.client.methods.HttpHead;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.PropertySource;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -29,8 +40,15 @@ import com.ruoyi.common.core.page.TableDataInfo;
*/
@RestController
@RequestMapping("/customer/customer")
+@PropertySource("classpath:/common.yml")
public class CustomerController extends BaseController
{
+ @Value("${qichacha.key}")
+ private String Qcc_Key;
+ // 接口请求Key
+ @Value("${qichacha.secretKey}")
+ private String Qcc_SecretKey;
+
@Autowired
private ICustomerService customerService;
@@ -77,6 +95,7 @@ public class CustomerController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody Customer customer)
{
+ customer.setCusCode(IdUtils.createNo("KH_",3));
return toAjax(customerService.insertCustomer(customer));
}
@@ -101,4 +120,33 @@ public class CustomerController extends BaseController
{
return toAjax(customerService.deleteCustomerByCusIds(cusIds));
}
+
+ /***********************************************企查查模块************************************/
+ /**
+ * 查询企查查客户列表
+ */
+ @PreAuthorize("@ss.hasPermi('customer:customer:qcclist')")
+ @GetMapping("/qccListCustomer")
+ public TableDataInfo qccListCustomer(FuzzySearch qcc)
+ {
+ String customerName = qcc.getName();
+ String reqInterNme = "https://api.qichacha.com/FuzzySearch/GetList";
+ List result = new ArrayList();
+ try {
+ if(!StringUtils.isEmpty(customerName)){
+ HttpHead reqHeader = new HttpHead();
+ String[] autherHeader = QiChaChaUtil.RandomAuthentHeader(Qcc_Key, Qcc_SecretKey);
+ reqHeader.setHeader("Token", autherHeader[0]);
+ reqHeader.setHeader("Timespan", autherHeader[1]);
+ String reqUri = reqInterNme.concat("?key=").concat(Qcc_Key).concat("&").concat("searchKey=").concat(customerName);
+ String tokenJson = HttpHelper.httpGet(reqUri, reqHeader.getAllHeaders());
+ System.out.println(String.format("==========================>this is response:{%s}", tokenJson));
+ QccFuzzySearchJsonResult obj = JSON.parseObject(tokenJson, QccFuzzySearchJsonResult.class);
+ result = obj.getResult();
+ }
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ return getDataTable(result);
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/IdUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/IdUtils.java
index 467d55a..93002ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/IdUtils.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/IdUtils.java
@@ -10,7 +10,7 @@ public class IdUtils {
* @param size 订单号中随机的大写字母个数
* @return
*/
- public static String createOrderNo(String startLetter,int size){
+ public static String createNo(String startLetter,int size){
String orderNo = null;
@@ -68,6 +68,6 @@ public class IdUtils {
*/
public static void main(String[] args) {
- System.out.println(createOrderNo("PO_",2));
+ System.out.println(createNo("PO_",2));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/qcc/HttpHelper.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/qcc/HttpHelper.java
new file mode 100644
index 0000000..b377883
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/qcc/HttpHelper.java
@@ -0,0 +1,129 @@
+package com.ruoyi.web.utils.qcc;
+import java.io.IOException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.util.EntityUtils;
+
+
+public class HttpHelper {
+
+ // get 请求
+ public static String httpGet(String url, Header[] headers) throws Exception {
+ HttpUriRequest uriRequest = new HttpGet(url);
+ if (null != headers)
+ uriRequest.setHeaders(headers);
+ CloseableHttpClient httpClient = null;
+ try {
+ httpClient = declareHttpClientSSL(url);
+ CloseableHttpResponse httpresponse = httpClient.execute(uriRequest);
+ HttpEntity httpEntity = httpresponse.getEntity();
+ String result = EntityUtils.toString(httpEntity, REQ_ENCODEING_UTF8);
+ return result;
+ } catch (ClientProtocolException e) {
+ System.out.println(String.format("http请求失败,uri{%s},exception{%s}", new Object[]{url, e}));
+ } catch (IOException e) {
+ System.out.println(String.format("IO Exception,uri{%s},exception{%s}", new Object[]{url, e}));
+ } finally {
+ if (null != httpClient)
+ httpClient.close();
+ }
+ return null;
+ }
+
+ // post 请求
+ public static String httpPost(String url, String params) throws Exception {
+ HttpPost post = new HttpPost(url);
+ post.addHeader("Content-Type", "application/json;charset=" + REQ_ENCODEING_UTF8);
+ // 设置传输编码格式
+ StringEntity stringEntity = new StringEntity(params, REQ_ENCODEING_UTF8);
+ stringEntity.setContentEncoding(REQ_ENCODEING_UTF8);
+ post.setEntity(stringEntity);
+ HttpResponse httpresponse = null;
+ CloseableHttpClient httpClient = null;
+ try {
+ httpClient = declareHttpClientSSL(url);
+ httpresponse = httpClient.execute(post);
+ HttpEntity httpEntity = httpresponse.getEntity();
+ String result = EntityUtils.toString(httpEntity, REQ_ENCODEING_UTF8);
+ return result;
+ } catch (ClientProtocolException e) {
+ System.out.println(String.format("http请求失败,uri{%s},exception{%s}", new Object[]{url, e}));
+ } catch (IOException e) {
+ System.out.println(String.format("IO Exception,uri{%s},exception{%s}", new Object[]{url, e}));
+ } finally {
+ if (null != httpClient)
+ httpClient.close();
+ }
+ return null;
+ }
+
+ private static CloseableHttpClient declareHttpClientSSL(String url) {
+ if (url.startsWith("https://")) {
+ return sslClient();
+ } else {
+ return HttpClientBuilder.create().setConnectionManager(httpClientConnectionManager).build();
+ }
+ }
+
+ /**
+ * 设置SSL请求处理
+ */
+ private static CloseableHttpClient sslClient() {
+ try {
+ SSLContext ctx = SSLContext.getInstance("TLS");
+ X509TrustManager tm = new X509TrustManager() {
+ public X509Certificate[] getAcceptedIssuers() {
+ return null;
+ }
+
+ public void checkClientTrusted(X509Certificate[] xcs, String str) {
+ }
+
+ public void checkServerTrusted(X509Certificate[] xcs, String str) {
+ }
+ };
+ ctx.init(null, new TrustManager[]{tm}, null);
+ SSLConnectionSocketFactory sslConnectionSocketFactory = SSLConnectionSocketFactory.getSocketFactory();
+ return HttpClients.custom().setSSLSocketFactory(sslConnectionSocketFactory).build();
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException(e);
+ } catch (KeyManagementException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ // this is config
+ private static final String REQ_ENCODEING_UTF8 = "utf-8";
+ private static PoolingHttpClientConnectionManager httpClientConnectionManager;
+
+ public HttpHelper() {
+ httpClientConnectionManager = new PoolingHttpClientConnectionManager();
+ httpClientConnectionManager.setMaxTotal(100);
+ httpClientConnectionManager.setDefaultMaxPerRoute(20);
+ }
+
+ // get 请求
+ public static String httpGet(String url) throws Exception {
+ return httpGet(url, null);
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/utils/qcc/QiChaChaUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/qcc/QiChaChaUtil.java
new file mode 100644
index 0000000..d36fb65
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/utils/qcc/QiChaChaUtil.java
@@ -0,0 +1,49 @@
+package com.ruoyi.web.utils.qcc;
+
+import java.io.IOException;
+import java.util.regex.Pattern;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class QiChaChaUtil {
+ // 获取返回码 Res Code
+ public static class HttpCodeRegex {
+ private static final String ABNORMAL_REGIX = "(101)|(102)";
+ private static final Pattern pattern = Pattern.compile(ABNORMAL_REGIX);
+ public static boolean isAbnornalRequest(final String status) {
+ return pattern.matcher(status).matches();
+ }
+ }
+
+ // 获取Auth Code
+ public static final String[] RandomAuthentHeader(String appkey,String seckey) {
+ String timeSpan = String.valueOf(System.currentTimeMillis() / 1000);
+ String[] authentHeaders = new String[] { DigestUtils.md5Hex(appkey.concat(timeSpan).concat(seckey)).toUpperCase(), timeSpan };
+ return authentHeaders;
+ }
+
+ // 解析JSON
+ public static String FormartJson(String jsonString, String key) throws JSONException {
+ JSONObject jObject = new JSONObject(jsonString);
+ return (String) jObject.get(key);
+ }
+
+ // pretty print 返回值
+ public static void PrettyPrintJson(String jsonString) throws JSONException {
+ try {
+ ObjectMapper mapper = new ObjectMapper();
+ Object obj = mapper.readValue(jsonString, Object.class);
+ String indented = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(obj);
+ System.out.println(indented);
+ } catch (JsonProcessingException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/ruoyi-admin/src/main/resources/common.yml b/ruoyi-admin/src/main/resources/common.yml
index 25585e7..4f7d077 100644
--- a/ruoyi-admin/src/main/resources/common.yml
+++ b/ruoyi-admin/src/main/resources/common.yml
@@ -6,3 +6,6 @@ order.commitDateEndPm: 20:00:00
sapWebservice.host: poprd
sapWebservice.user: PO_USER
sapWebservice.psw: QAZ54321
+
+qichacha.key: 824936f8e78c4f4788978da38b26d488
+qichacha.secretKey: 8B9EB102FD17E0CF2EDEC0FB507DEC1E
diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/Contract.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/Contract.java
deleted file mode 100644
index 1a7e779..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/Contract.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.ruoyi.contract.domain;
-
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 合同管理对象 Contract
- *
- * @author ruoyi
- * @date 2024-01-23
- */
-public class Contract extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 日期 */
- @Excel(name = "日期")
- private String contractDate;
- private String[] contractDateRange;
-
- /** 合同号 */
- @Excel(name = "合同号")
- private String contractNo;
-
- /** 业务员编码 */
- @Excel(name = "业务员编码")
- private String contractSalesmanNo;
-
- /** 业务员 */
- @Excel(name = "业务员")
- private String contractSalesman;
-
- /** 客户*/
- @Excel(name = "客户")
- private String contractCustom;
-
- /** 合同金额 */
- @Excel(name = "合同金额")
- private String contractJine;
-
- /** 备注 */
- @Excel(name = "备注")
- private String contractRemark;
-
- public String getContractDate() {
- return contractDate;
- }
-
- public void setContractDate(String contractDate) {
- this.contractDate = contractDate;
- }
-
- public String getContractNo() {
- return contractNo;
- }
-
- public void setContractNo(String contractNo) {
- this.contractNo = contractNo;
- }
-
- public String getContractSalesman() {
- return contractSalesman;
- }
-
- public void setContractSalesman(String contractSalesman) {
- this.contractSalesman = contractSalesman;
- }
-
- public String getContractCustom() {
- return contractCustom;
- }
-
- public void setContractCustom(String contractCustom) {
- this.contractCustom = contractCustom;
- }
-
- public String getContractJine() {
- return contractJine;
- }
-
- public void setContractJine(String contractJine) {
- this.contractJine = contractJine;
- }
-
- public String getContractRemark() {
- return contractRemark;
- }
-
- public void setContractRemark(String contractRemark) {
- this.contractRemark = contractRemark;
- }
-
- public String getContractSalesmanNo() {
- return contractSalesmanNo;
- }
-
- public void setContractSalesmanNo(String contractSalesmanNo) {
- this.contractSalesmanNo = contractSalesmanNo;
- }
-
- public String[] getContractDateRange() {return contractDateRange;}
-
- public void setContractDateRange(String[] contractDateRange) {this.contractDateRange = contractDateRange;}
-}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/FuzzySearch.java b/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/FuzzySearch.java
new file mode 100644
index 0000000..7f38743
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/FuzzySearch.java
@@ -0,0 +1,76 @@
+package com.ruoyi.customer.domain.qcc;
+
+public class FuzzySearch {
+ private String KeyNo;
+ private String Name;
+ private String CreditCode;
+ private String StartDate;
+ private String OperName;
+ private String Status;
+ private String No;
+ private String Address;
+
+ public String getKeyNo() {
+ return KeyNo;
+ }
+
+ public void setKeyNo(String keyNo) {
+ KeyNo = keyNo;
+ }
+
+ public String getName() {
+ return Name;
+ }
+
+ public void setName(String name) {
+ Name = name;
+ }
+
+ public String getCreditCode() {
+ return CreditCode;
+ }
+
+ public void setCreditCode(String creditCode) {
+ CreditCode = creditCode;
+ }
+
+ public String getStartDate() {
+ return StartDate;
+ }
+
+ public void setStartDate(String startDate) {
+ StartDate = startDate;
+ }
+
+ public String getOperName() {
+ return OperName;
+ }
+
+ public void setOperName(String operName) {
+ OperName = operName;
+ }
+
+ public String getStatus() {
+ return Status;
+ }
+
+ public void setStatus(String status) {
+ Status = status;
+ }
+
+ public String getNo() {
+ return No;
+ }
+
+ public void setNo(String no) {
+ No = no;
+ }
+
+ public String getAddress() {
+ return Address;
+ }
+
+ public void setAddress(String address) {
+ Address = address;
+ }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/Qcc.java b/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/Qcc.java
new file mode 100644
index 0000000..4a660c1
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/Qcc.java
@@ -0,0 +1,40 @@
+package com.ruoyi.customer.domain.qcc;
+
+public class Qcc {
+ private String qccCustomerName;
+ private String qccLegalPerson;
+ private String qccRegistrationTime;
+ private String qccVatNO;
+
+ public String getQccCustomerName() {
+ return qccCustomerName;
+ }
+
+ public void setQccCustomerName(String qccCustomerName) {
+ this.qccCustomerName = qccCustomerName;
+ }
+
+ public String getQccLegalPerson() {
+ return qccLegalPerson;
+ }
+
+ public void setQccLegalPerson(String qccLegalPerson) {
+ this.qccLegalPerson = qccLegalPerson;
+ }
+
+ public String getQccRegistrationTime() {
+ return qccRegistrationTime;
+ }
+
+ public void setQccRegistrationTime(String qccRegistrationTime) {
+ this.qccRegistrationTime = qccRegistrationTime;
+ }
+
+ public String getQccVatNO() {
+ return qccVatNO;
+ }
+
+ public void setQccVatNO(String qccVatNO) {
+ this.qccVatNO = qccVatNO;
+ }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/QccFuzzySearchJsonResult.java b/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/QccFuzzySearchJsonResult.java
new file mode 100644
index 0000000..86beecf
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/customer/domain/qcc/QccFuzzySearchJsonResult.java
@@ -0,0 +1,15 @@
+package com.ruoyi.customer.domain.qcc;
+
+import java.util.List;
+
+public class QccFuzzySearchJsonResult {
+ private List Result;
+
+ public List getResult() {
+ return Result;
+ }
+
+ public void setResult(List result) {
+ Result = result;
+ }
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java
index 4c9fd96..ae0f276 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/customer/service/impl/CustomerServiceImpl.java
@@ -13,19 +13,19 @@ import com.ruoyi.customer.service.ICustomerService;
/**
* 客户管理Service业务层处理
- *
+ *
* @author ruoyi
* @date 2024-03-25
*/
@Service
-public class CustomerServiceImpl implements ICustomerService
+public class CustomerServiceImpl implements ICustomerService
{
@Autowired
private CustomerMapper customerMapper;
/**
* 查询客户管理
- *
+ *
* @param cusId 客户管理主键
* @return 客户管理
*/
@@ -37,7 +37,7 @@ public class CustomerServiceImpl implements ICustomerService
/**
* 查询客户管理列表
- *
+ *
* @param customer 客户管理
* @return 客户管理
*/
@@ -49,7 +49,7 @@ public class CustomerServiceImpl implements ICustomerService
/**
* 新增客户管理
- *
+ *
* @param customer 客户管理
* @return 结果
*/
@@ -64,7 +64,7 @@ public class CustomerServiceImpl implements ICustomerService
/**
* 修改客户管理
- *
+ *
* @param customer 客户管理
* @return 结果
*/
@@ -79,7 +79,7 @@ public class CustomerServiceImpl implements ICustomerService
/**
* 批量删除客户管理
- *
+ *
* @param cusIds 需要删除的客户管理主键
* @return 结果
*/
@@ -93,7 +93,7 @@ public class CustomerServiceImpl implements ICustomerService
/**
* 删除客户管理信息
- *
+ *
* @param cusId 客户管理主键
* @return 结果
*/
@@ -107,7 +107,7 @@ public class CustomerServiceImpl implements ICustomerService
/**
* 新增银行信息
- *
+ *
* @param customer 客户管理对象
*/
public void insertBank(Customer customer)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/storageLocation/service/impl/StorageLocationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/storageLocation/service/impl/StorageLocationServiceImpl.java
index 4f67840..5007037 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/storageLocation/service/impl/StorageLocationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/storageLocation/service/impl/StorageLocationServiceImpl.java
@@ -7,6 +7,7 @@ import com.ruoyi.storageLocation.mapper.StorageLocationMapper;
import com.ruoyi.storageLocation.service.StorageLocationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -45,6 +46,7 @@ public class StorageLocationServiceImpl implements StorageLocationService
* @param storageLocation
* @return
*/
+ @Transactional
@Override
public int addStorageLocation(StorageLocation storageLocation) {
return storageLocationMapper.addStorageLocation(storageLocation);
@@ -54,6 +56,7 @@ public class StorageLocationServiceImpl implements StorageLocationService
* 确认完成认领
* @param materialBhArr
*/
+ @Transactional
@Override
public void confirmStorageLocation(List materialBhArr) {
storageLocationMapper.confirmStorageLocation(materialBhArr);
@@ -73,6 +76,7 @@ public class StorageLocationServiceImpl implements StorageLocationService
* 保存至已选库位表
* @param materialBh
*/
+ @Transactional
@Override
public void saveStorageLocation(String userName,String materialBh) {
storageLocationMapper.saveStorageLocation(userName,materialBh);
@@ -83,6 +87,7 @@ public class StorageLocationServiceImpl implements StorageLocationService
* @param userName
* @param materialBh
*/
+ @Transactional
@Override
public void deleteStorageLocation(String userName, String materialBh) {
storageLocationMapper.deleteStorageLocation(userName,materialBh);
@@ -120,6 +125,7 @@ public class StorageLocationServiceImpl implements StorageLocationService
* @param userName
* @param materialBhList
*/
+ @Transactional
@Override
public void deleteBatchStorageLocation(String userName, List materialBhList) {
storageLocationMapper.deleteBatchStorageLocation(userName,materialBhList);
@@ -129,6 +135,7 @@ public class StorageLocationServiceImpl implements StorageLocationService
* 插入操作记录表
* @param operlog
*/
+ @Transactional
@Override
public void addOperlog(Operlog operlog) {
storageLocationMapper.addOperlog(operlog);
@@ -149,6 +156,7 @@ public class StorageLocationServiceImpl implements StorageLocationService
* 批量插入操作记录表
* @param operlogList
*/
+ @Transactional
@Override
public void addBatchOperlog(List operlogList) {
storageLocationMapper.addBatchOperlog(operlogList);
diff --git a/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml b/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml
index 346cbe0..6009218 100644
--- a/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/customer/CustomerMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
+
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
-
-
+
+
insert into customer
- cus_id,
cus_code,
cus_name,
cus_sap_code,
@@ -88,7 +87,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
cus_approval_status,
- #{cusId},
#{cusCode},
#{cusName},
#{cusSapCode},
@@ -144,14 +142,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- delete from customer where cus_id in
+ delete from customer where cus_id in
#{cusId}
-
+
- delete from bank where cus_id in
+ delete from bank where cus_id in
#{cusId}
@@ -162,9 +160,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- insert into bank( bank_id, bank_name, bank_account, cus_id) values
+ insert into bank(bank_name, bank_account, cus_id) values
- ( #{item.bankId}, #{item.bankName}, #{item.bankAccount}, #{item.cusId})
+ ( #{item.bankName}, #{item.bankAccount}, #{item.cusId})
-
\ No newline at end of file
+
diff --git a/ruoyi-ui/src/api/customer/customer.js b/ruoyi-ui/src/api/customer/customer.js
index 262ccf2..5626766 100644
--- a/ruoyi-ui/src/api/customer/customer.js
+++ b/ruoyi-ui/src/api/customer/customer.js
@@ -42,3 +42,13 @@ export function delCustomer(cusId) {
method: 'delete'
})
}
+
+/******************************企查查模块***********************************/
+// 查询企查查客户列表
+export function qccListCustomer(query) {
+ return request({
+ url: '/customer/customer/qccListCustomer',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/ruoyi-ui/src/views/customer/customer/index.vue b/ruoyi-ui/src/views/customer/customer/index.vue
index 85fc23f..09e581d 100644
--- a/ruoyi-ui/src/views/customer/customer/index.vue
+++ b/ruoyi-ui/src/views/customer/customer/index.vue
@@ -1,6 +1,14 @@
-
+
+
+
+
-
+
-
+
-
+
@@ -105,7 +113,7 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
银行信息
-
+
添加
@@ -219,12 +296,12 @@
-
+
-
+
@@ -232,19 +309,64 @@
+
+
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+
+
+
+
-
+