中电企业查询，网站仓库查询接口 出库查询库存接口提单号为判断空串

ruoyi-admin/pom.xml

@@ -17,6 +17,13 @@
 
     <dependencies>
 
+        <!--Unirest-->
+        <dependency>
+            <groupId>com.mashape.unirest</groupId>
+            <artifactId>unirest-java</artifactId>
+            <version>1.4.9</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
@@ -178,4 +185,4 @@
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
+</project>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/CategoryNewEnum.java

@@ -0,0 +1,47 @@
+package com.ruoyi.web.controller.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author caifc
+ * @date 2021-10-20 14:38
+ */
+@Getter
+@AllArgsConstructor
+public enum CategoryNewEnum {
+
+	ERROR_1("0115601", "企业"),
+	ERROR_2("0115602", "个体"),
+	ERROR_3("0115603", "农民专业合作社"),
+	ERROR_4("0115699", "其他类型"),
+	ERROR_5("0215601", "社会团体"),
+	ERROR_6("0215602", "基金会"),
+	ERROR_7("0215603", "民办非企业单位"),
+	ERROR_8("0215604", "村民/居民委员会"),
+	ERROR_9("0215605", "宗教，工会等其他社会组织"),
+	ERROR_10("0315601", "事业单位"),
+	ERROR_11("0315602", "机关"),
+	ERROR_12("0315603", "其他机构编制"),
+	ERROR_13("0434401", "香港企业"),
+	ERROR_14("0444602", "澳门企业"),
+	ERROR_15("0415803", "台湾企业"),
+	ERROR_16("0499904", "国外企业"),
+	ERROR_17("0515601", "律所"),
+	ERROR_18("0500099", "其他组织机构"),
+    ;
+
+    private final String type;
+
+    private final String describe;
+
+    public static CategoryNewEnum fromType(String orderType) {
+        for (CategoryNewEnum type : CategoryNewEnum.values()) {
+            if (type.getType().equals(orderType)) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("order type not exist");
+    }
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/ErrorCodeEnum.java

@@ -0,0 +1,48 @@
+package com.ruoyi.web.controller.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author caifc
+ * @date 2021-10-20 14:38
+ */
+@Getter
+@AllArgsConstructor
+public enum ErrorCodeEnum {
+
+	ERROR_1(200, "查询成功"),
+	ERROR_2(201, "查询无结果"),
+	ERROR_3(202, "该实时查询Job进行中"),
+	ERROR_4(203, "数据正在更新，请稍后查询"),
+	ERROR_5(207, "查询错误，请联系技术人员"),
+	ERROR_6(208, "参数名错误或参数为空"),
+	ERROR_7(209, "接口查询异常，请联系技术人员"),
+	ERROR_8(213, "调用次数超过今日额度限制"),
+	ERROR_9(214, "接口调用鉴权失败"),
+	ERROR_10(216, "调用次数超过账户额度限制"),
+	ERROR_11(101, "AppKey无效"),
+	ERROR_12(102, "账户余额不足"),
+	ERROR_13(103, "AppKey被停用"),
+	ERROR_14(104, "未添加IP白名单"),
+	ERROR_15(105, "未授权调用该接口"),
+	ERROR_16(109, "接口被停用，等其他状态"),
+	ERROR_17(110, "账户已过期"),
+	ERROR_18(113, "账户未激活"),
+
+    ;
+
+    private final int type;
+
+    private final String describe;
+
+    public static ErrorCodeEnum fromType(Integer orderType) {
+        for (ErrorCodeEnum type : ErrorCodeEnum.values()) {
+            if (type.getType() == orderType) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("order type not exist");
+    }
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/TagsEnum.java

@@ -0,0 +1,35 @@
+package com.ruoyi.web.controller.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author caifc
+ * @date 2021-10-20 14:38
+ */
+@Getter
+@AllArgsConstructor
+public enum TagsEnum {
+
+    ERROR_1("1", "新三板"),
+    ERROR_2("6", "主板上市公司"),
+    ERROR_3("40", "暂停上市"),
+    ERROR_4("41", "终止上市"),
+    ERROR_5("9", "香港上市"),
+    ERROR_6("17", "高新企业"),
+    ;
+
+    private final String type;
+
+    private final String describe;
+
+    public static TagsEnum fromType(String orderType) {
+        for (TagsEnum type : TagsEnum.values()) {
+            if (type.getType().equals(orderType)) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("order type not exist");
+    }
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/enums/TypeNewEnum.java

@@ -0,0 +1,34 @@
+package com.ruoyi.web.controller.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author caifc
+ * @date 2021-10-20 14:38
+ */
+@Getter
+@AllArgsConstructor
+public enum TypeNewEnum {
+
+	ERROR_1("01", "大陆企业"),
+	ERROR_2("02", "社会组织"),
+	ERROR_3("03", "机关及事业单位"),
+	ERROR_4("04", "港澳台及国外企业"),
+	ERROR_5("05", "律所及其他组织机构"),
+    ;
+
+    private final String type;
+
+    private final String describe;
+
+    public static TypeNewEnum fromType(String orderType) {
+        for (TypeNewEnum type : TypeNewEnum.values()) {
+			if (type.getType().equals(orderType)) {
+                return type;
+            }
+        }
+        throw new IllegalArgumentException("order type not exist");
+    }
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/HttpUtils.java

@@ -0,0 +1,262 @@
+package com.ruoyi.web.controller.tool;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.mashape.unirest.http.HttpResponse;
+import com.mashape.unirest.http.Unirest;
+import com.ruoyi.basicData.domain.TEnterpriseInformation;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.web.controller.enums.CategoryNewEnum;
+import com.ruoyi.web.controller.enums.ErrorCodeEnum;
+import com.ruoyi.web.controller.enums.TagsEnum;
+import com.ruoyi.web.controller.enums.TypeNewEnum;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.util.*;
+
+/**
+ * @author :jixinyuan
+ * @date : 2025/2/25
+ */
+public class HttpUtils {
+
+    // 获取字符串的md5值
+    public static String getMD5Str(String str) {
+        byte[] digest = null;
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            md.update(str.getBytes(StandardCharsets.UTF_8));
+            digest = md.digest();
+
+            StringBuilder sb = new StringBuilder();
+            for (byte b : digest) {
+                String s = String.format("%02x", b);
+                sb.append(s);
+            }
+            return sb.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    // 获取字符串的md5值
+    public static List<Map<String, Object>> advSearch(String keyword, String matchType, String region, Integer skip) throws Exception {
+        String baseUrl = "https://api.qixin.com/APIService/v2/search/advSearch";
+        String appkey = "f34e245e-1de8-4f92-9ee2-0c0f579e5510";
+        String secretKey = "0172e543-4020-4f47-a838-9c50c48ac422";
+        Calendar calendar = Calendar.getInstance();
+        Long timestamp = calendar.getTime().getTime();
+        String sign = getMD5Str(appkey + timestamp + secretKey);
+
+        // 设置url参数
+        Map<String, String> urlParams = new HashMap<String, String>();
+        urlParams.put("keyword", keyword);
+        /*urlParams.put("matchType", matchType);
+        urlParams.put("region", region);
+        urlParams.put("skip", skip+"");*/
+
+        List<String> concatParams = new ArrayList<String>();
+        for (String s : urlParams.keySet()) {
+            concatParams.add(s + "=" + URLEncoder.encode(urlParams.get(s), "UTF-8"));
+        }
+
+        Unirest.setTimeouts(0, 2000);
+        List<Map<String, Object>> list = new ArrayList<>();
+        try {
+            // 发送get请求，得到响应
+            HttpResponse<String> response = Unirest.get(baseUrl + "?" + String.join("&", concatParams))
+                    .header("Auth-version", "2.0")
+                    .header("appkey", appkey)
+                    .header("timestamp", timestamp + "")
+                    .header("sign", sign)
+                    .header("Content-Type", "application/json")
+                    .asString();
+            String body = response.getBody();
+            JSONObject jsonObject = JSON.parseObject(body);
+            if ("200".equals(jsonObject.get("status"))) {
+                JSONObject jsonData = JSON.parseObject(jsonObject.get("data").toString());
+                String jsonArray = jsonData.getJSONArray("items").toString();
+                if (ObjectUtil.isNotNull(jsonArray)) {
+                    ObjectMapper mapper = new ObjectMapper();
+                    try {
+                        ArrayNode arrayNode = (ArrayNode) mapper.readTree(jsonArray);
+                        Iterator<JsonNode> iterator = arrayNode.iterator();
+                        while (iterator.hasNext()) {
+                            JsonNode node = iterator.next();
+                            Map<String, Object> map = new HashMap<>();
+                            Iterator<String> fieldNames = node.fieldNames();
+                            while (fieldNames.hasNext()) {
+                                String key = fieldNames.next();
+                                map.put(key, node.get(key).asText()); // 或者使用其他如asInt(), asDouble()等根据需要转换类型的方法
+                            }
+                            list.add(map);
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+                return list;
+            } else {
+                ErrorCodeEnum errorCodeEnum = ErrorCodeEnum.fromType(Integer.parseInt(jsonObject.get("status").toString()));
+                throw new RuntimeException(errorCodeEnum.getDescribe());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+    public static TEnterpriseInformation getDetailAndContactByName(String keyword) throws Exception {
+        TEnterpriseInformation enterpriseInformation = new TEnterpriseInformation();
+        String baseUrl = "https://api.qixin.com/APIService/enterprise/getDetailAndContactByName";
+        String appkey = "f34e245e-1de8-4f92-9ee2-0c0f579e5510";
+        String secretKey = "0172e543-4020-4f47-a838-9c50c48ac422";
+        Calendar calendar = Calendar.getInstance();
+        Long timestamp = calendar.getTime().getTime();
+        String sign = getMD5Str(appkey + timestamp + secretKey);
+
+        // 设置url参数
+        Map<String, String> urlParams = new HashMap<String, String>();
+        urlParams.put("keyword", keyword);
+
+        List<String> concatParams = new ArrayList<String>();
+        for (String s : urlParams.keySet()) {
+            concatParams.add(s + "=" + URLEncoder.encode(urlParams.get(s), "UTF-8"));
+        }
+        Unirest.setTimeouts(0, 2000);
+        try {
+            // 发送get请求，得到响应
+            HttpResponse<String> response = Unirest.get(baseUrl + "?" + String.join("&", concatParams))
+                    .header("Auth-version", "2.0")
+                    .header("appkey", appkey)
+                    .header("timestamp", timestamp + "")
+                    .header("sign", sign)
+                    .header("Content-Type", "application/json")
+                    .asString();
+
+            String body = response.getBody();
+            JSONObject jsonObject = JSON.parseObject(body);
+            if ("200".equals(jsonObject.get("status"))) {
+                JSONObject jsonData = JSON.parseObject(jsonObject.get("data").toString());
+                if (ObjectUtil.isNotNull(jsonData)) {
+                    System.err.println(jsonData);
+
+                    enterpriseInformation.setStatus(jsonData.getString("status"));
+                    enterpriseInformation.setActualCapi(jsonData.getString("actual_capi"));
+                    enterpriseInformation.setOrgNo(jsonData.getString("orgNo"));
+                    JSONArray branches = jsonData.getJSONArray("branches");
+                    if (!branches.isEmpty()) {
+                        enterpriseInformation.setBranches(branches.toString());
+                    } else {
+                        enterpriseInformation.setBranches("[]");
+                    }
+                    enterpriseInformation.setTermEnd(jsonData.getString("term_end"));
+                    enterpriseInformation.setScope(jsonData.getString("scope"));
+                    JSONArray partners = jsonData.getJSONArray("partners");
+                    if (!partners.isEmpty()) {
+                        enterpriseInformation.setPartners(partners.toString());
+                    } else {
+                        enterpriseInformation.setPartners("[]");
+                    }
+                    enterpriseInformation.setCreditNo(jsonData.getString("credit_no"));
+                    enterpriseInformation.setStartDate(jsonData.getString("start_date"));
+                    JSONArray domains = jsonData.getJSONArray("domains");
+                    if (!domains.isEmpty()) {
+                        enterpriseInformation.setDomains(domains.toString());
+                    } else {
+                        enterpriseInformation.setDomains("[]");
+                    }
+                    enterpriseInformation.setDistrictCode(jsonData.getString("district_code"));
+                    JSONArray quoted_type = jsonData.getJSONArray("quoted_type");
+                    if (!quoted_type.isEmpty()) {
+                        JSONArray quotedTypeNew = new JSONArray();
+                        for (Object item : quoted_type) {
+                            if ("1".equals(item)) {
+                                item = "新三板";
+                            } else if ("6".equals(item)) {
+                                item = "沪深市";
+                            } else if ("9".equals(item)) {
+                                item = "香港上市";
+                            } else {
+                                item = "-";
+                            }
+                            quotedTypeNew.add(item);
+                        }
+                        enterpriseInformation.setQuotedType(quotedTypeNew.toString());
+                    } else {
+                        enterpriseInformation.setQuotedType("[]");
+                    }
+                    enterpriseInformation.setCity(jsonData.getString("city"));
+                    enterpriseInformation.setRegistCapi(jsonData.getString("regist_capi"));
+                    enterpriseInformation.setRegNo(jsonData.getString("reg_no"));
+                    enterpriseInformation.setBelongOrg(jsonData.getString("belong_org"));
+                    enterpriseInformation.setAddress(jsonData.getString("address"));
+                    enterpriseInformation.setName(jsonData.getString("name"));
+                    enterpriseInformation.setFormatName(jsonData.getString("format_name"));
+                    JSONArray employees = jsonData.getJSONArray("employees");
+                    if (!employees.isEmpty()) {
+                        enterpriseInformation.setEmployees(employees.toString());
+                    } else {
+                        enterpriseInformation.setEmployees("[]");
+                    }
+                    enterpriseInformation.setOperName(jsonData.getString("oper_name"));
+                    enterpriseInformation.setEconKindCode(jsonData.getString("econ_kind_code"));
+                    enterpriseInformation.setEnterpriseId(jsonData.getString("id"));
+                    JSONArray changerecords = jsonData.getJSONArray("changerecords");
+                    if (!changerecords.isEmpty()) {
+                        enterpriseInformation.setChangerecords(changerecords.toString());
+                    } else {
+                        enterpriseInformation.setChangerecords("[]");
+                    }
+                    JSONArray abnormal_items = jsonData.getJSONArray("abnormal_items");
+                    if (!abnormal_items.isEmpty()) {
+                        enterpriseInformation.setAbnormalItems(abnormal_items.toString());
+                    } else {
+                        enterpriseInformation.setAbnormalItems("[]");
+                    }
+                    enterpriseInformation.setProvince(jsonData.getString("province"));
+                    JSONArray websites = jsonData.getJSONArray("websites");
+                    if (!websites.isEmpty()) {
+                        enterpriseInformation.setWebsites(websites.toString());
+                    } else {
+                        enterpriseInformation.setWebsites("[]");
+                    }
+                    enterpriseInformation.setEconKind(jsonData.getString("econ_kind"));
+                    enterpriseInformation.setNewStatus(jsonData.getString("new_status"));
+                    enterpriseInformation.setIsQuoted(jsonData.getString("is_quoted"));
+                    enterpriseInformation.setContact(jsonData.getString("contact"));
+                    enterpriseInformation.setTermStart(jsonData.getString("term_start"));
+                    JSONArray historyNames = jsonData.getJSONArray("history_names");
+                    if (!historyNames.isEmpty()) {
+                        enterpriseInformation.setHistoryNames(historyNames.toString());
+                    } else {
+                        enterpriseInformation.setHistoryNames("[]");
+                    }
+                    enterpriseInformation.setIndustryCode(jsonData.getString("industry_code"));
+                    enterpriseInformation.setColleguesNum(jsonData.getString("collegues_num"));
+                    enterpriseInformation.setIsHistory(jsonData.getInteger("is_history"));
+                    enterpriseInformation.setCheckDate(jsonData.getString("check_date"));
+                    enterpriseInformation.setCreateBy(SecurityUtils.getUsername());
+                    enterpriseInformation.setCreateTime(new Date());
+                }
+                return enterpriseInformation;
+            } else {
+                ErrorCodeEnum errorCodeEnum = ErrorCodeEnum.fromType(Integer.parseInt(jsonObject.get("status").toString()));
+                throw new RuntimeException(errorCodeEnum.getDescribe());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return enterpriseInformation;
+    }
+
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/basicData/TEnterpriseInformationController.java

@@ -0,0 +1,159 @@
+package com.ruoyi.web.controller.warehouse.basicData;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.basicData.domain.TEnterpriseInformation;
+import com.ruoyi.basicData.service.ITEnterpriseInformationService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.web.controller.tool.HttpUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 企业信息Controller
+ *
+ * @author ruoyi
+ * @date 2025-02-25
+ */
+@RestController
+@RequestMapping("/warehouse/information")
+public class TEnterpriseInformationController extends BaseController {
+    @Autowired
+    private ITEnterpriseInformationService tEnterpriseInformationService;
+
+    /**
+     * 查询企业信息列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TEnterpriseInformation tEnterpriseInformation) {
+        startPage();
+        List<TEnterpriseInformation> list = tEnterpriseInformationService.selectTEnterpriseInformationList(tEnterpriseInformation);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出企业信息列表
+     */
+    @GetMapping("/export")
+    public AjaxResult export(TEnterpriseInformation tEnterpriseInformation) {
+        List<TEnterpriseInformation> list = tEnterpriseInformationService.selectTEnterpriseInformationList(tEnterpriseInformation);
+        ExcelUtil<TEnterpriseInformation> util = new ExcelUtil<TEnterpriseInformation>(TEnterpriseInformation.class);
+        return util.exportExcel(list, "information");
+    }
+
+    /**
+     * 获取企业信息详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return AjaxResult.success(tEnterpriseInformationService.selectTEnterpriseInformationById(id));
+    }
+
+    /**
+     * 新增企业信息
+     */
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody TEnterpriseInformation tEnterpriseInformation) {
+        return toAjax(tEnterpriseInformationService.insertTEnterpriseInformation(tEnterpriseInformation));
+    }
+
+    /**
+     * 修改企业信息
+     */
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody TEnterpriseInformation tEnterpriseInformation) {
+        return toAjax(tEnterpriseInformationService.updateTEnterpriseInformation(tEnterpriseInformation));
+    }
+
+    /**
+     * 删除企业信息
+     */
+    @PostMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(tEnterpriseInformationService.deleteTEnterpriseInformationByIds(ids));
+    }
+
+    /**
+     * 查询企业信息列表
+     */
+    @GetMapping("/advSearch")
+    public List<Map<String, Object>> advSearch(@RequestParam(value = "keyword") String keyword,
+                                               @RequestParam(value = "matchType", required = false) String matchType,
+                                               @RequestParam(value = "matchType", required = false) String region,
+                                               @RequestParam(value = "matchType", required = false) Integer skip) throws Exception {
+        return HttpUtils.advSearch(keyword, matchType, region, skip);
+    }
+
+    /**
+     * 查询企业信息列表
+     */
+    @GetMapping("/getBasicInfo")
+    public AjaxResult getBasicInfo(@RequestParam(value = "keyword") String keyword) throws Exception {
+        TEnterpriseInformation tEnterpriseInformation = tEnterpriseInformationService.selectTEnterpriseInformation(keyword);
+        if (tEnterpriseInformation != null) {
+            if (ObjectUtil.isNotNull(tEnterpriseInformation.getBranches())) {
+                ObjectMapper mapper = new ObjectMapper();
+                tEnterpriseInformation.setBranchesList(mapper.readValue(tEnterpriseInformation.getBranches(),
+                        mapper.getTypeFactory().constructCollectionType(List.class, Map.class)));
+            }
+            if (ObjectUtil.isNotNull(tEnterpriseInformation.getPartners())) {
+                ObjectMapper mapper = new ObjectMapper();
+                tEnterpriseInformation.setPartnersList(mapper.readValue(tEnterpriseInformation.getPartners(),
+                        mapper.getTypeFactory().constructCollectionType(List.class, Map.class)));
+            }
+            if (ObjectUtil.isNotNull(tEnterpriseInformation.getEmployees())) {
+                ObjectMapper mapper = new ObjectMapper();
+                tEnterpriseInformation.setEmployeesList(mapper.readValue(tEnterpriseInformation.getEmployees(),
+                        mapper.getTypeFactory().constructCollectionType(List.class, Map.class)));
+            }
+            if (ObjectUtil.isNotNull(tEnterpriseInformation.getChangerecords())) {
+                ObjectMapper mapper = new ObjectMapper();
+                tEnterpriseInformation.setChangerecordsList(mapper.readValue(tEnterpriseInformation.getChangerecords(),
+                        mapper.getTypeFactory().constructCollectionType(List.class, Map.class)));
+            }
+            if (ObjectUtil.isNotNull(tEnterpriseInformation.getAbnormalItems())) {
+                ObjectMapper mapper = new ObjectMapper();
+                tEnterpriseInformation.setAbnormalItemsList(mapper.readValue(tEnterpriseInformation.getAbnormalItems(),
+                        mapper.getTypeFactory().constructCollectionType(List.class, Map.class)));
+            }
+            if (ObjectUtil.isNotNull(tEnterpriseInformation.getWebsites())) {
+                ObjectMapper mapper = new ObjectMapper();
+                tEnterpriseInformation.setWebsitesList(mapper.readValue(tEnterpriseInformation.getWebsites(),
+                        mapper.getTypeFactory().constructCollectionType(List.class, Map.class)));
+            }
+            if (ObjectUtil.isNotNull(tEnterpriseInformation.getContact())) {
+                ObjectMapper mapper = new ObjectMapper();
+                tEnterpriseInformation.setContactMap(mapper.readValue(tEnterpriseInformation.getContact(), Map.class));
+            }
+            if (ObjectUtil.isNotNull(tEnterpriseInformation.getIndustryCode())) {
+                ObjectMapper mapper = new ObjectMapper();
+                tEnterpriseInformation.setIndustryCodeMap(mapper.readValue(tEnterpriseInformation.getIndustryCode(), Map.class));
+            }
+            if (ObjectUtil.isNotNull(tEnterpriseInformation.getDomains())) {
+                ObjectMapper mapper = new ObjectMapper();
+                tEnterpriseInformation.setDomainsList(mapper.readValue(tEnterpriseInformation.getDomains(),
+                        mapper.getTypeFactory().constructCollectionType(List.class, String.class)));
+            }
+            if (ObjectUtil.isNotNull(tEnterpriseInformation.getQuotedType())) {
+                ObjectMapper mapper = new ObjectMapper();
+                tEnterpriseInformation.setQuotedTypeList(mapper.readValue(tEnterpriseInformation.getQuotedType(),
+                        mapper.getTypeFactory().constructCollectionType(List.class, String.class)));
+            }
+            return AjaxResult.success(tEnterpriseInformation);
+        } else {
+            TEnterpriseInformation tEnterpriseInformationNew = HttpUtils.getDetailAndContactByName(keyword);
+            if (tEnterpriseInformationNew != null) {
+                tEnterpriseInformationService.insertTEnterpriseInformation(tEnterpriseInformationNew);
+                return AjaxResult.success(tEnterpriseInformationNew);
+            } else {
+                return AjaxResult.error("获取公司数据失败");
+            }
+        }
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/reportManagement/TWhgenlegController.java

@@ -1,9 +1,11 @@
 package com.ruoyi.web.controller.warehouse.reportManagement;
 
+import com.ruoyi.basicData.service.ITWarehouseService;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
@@ -34,6 +36,9 @@ public class TWhgenlegController extends BaseController {
     @Autowired
     private ITWhgenlegService tWhgenlegService;
 
+    @Autowired
+    private ITWarehouseService tWarehouseService;
+
     /**
      * 出库、调拨、货转查询库存总账列表
      */
@@ -278,6 +283,16 @@ public class TWhgenlegController extends BaseController {
     }
 
     /**
+     * 网站仓库下拉选
+     */
+    @DataScope(deptAlias = "d", userAlias = "u")
+    @GetMapping("/tWarehouseList")
+    public AjaxResult tWarehouseList(TWhgenleg tWhgenleg) {
+        List<TWarehouse> tWarehouses = tWhgenlegService.tWarehouseList(tWhgenleg);
+        return AjaxResult.success(tWarehouseService.buildDeptTreeSelect(tWarehouses));
+    }
+
+    /**
      * app查询库存总账列表
      */
     //@DataScope(deptAlias = "d", userAlias = "u")

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/domain/TEnterpriseInformation.java

@@ -0,0 +1,765 @@
+package com.ruoyi.basicData.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 企业信息对象 t_enterprise_information
+ *
+ * @author ruoyi
+ * @date 2025-02-25
+ */
+public class TEnterpriseInformation extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Long id;
+
+    /**
+     * 删除状态
+     */
+    private String delFlag;
+
+    /**
+     * 企业类型
+     */
+    @Excel(name = "企业类型")
+    private String econKind;
+
+    /**
+     * 注册资本（金额数字+1个空格+万+货币单位）
+     */
+    @Excel(name = "注册资本", readConverterExp = "金=额数字+1个空格+万+货币单位")
+    private String registCapi;
+
+    /**
+     * 企业id
+     */
+    @Excel(name = "企业id")
+    private String enterpriseId;
+
+    /**
+     * 所属工商局
+     */
+    @Excel(name = "所属工商局")
+    private String belongOrg;
+
+    /**
+     * 经营状态（工商公示原始字段用）
+     */
+    @Excel(name = "经营状态", readConverterExp = "工=商公示原始字段用")
+    private String status;
+
+    /**
+     * 营业开始日期
+     */
+    @Excel(name = "营业开始日期")
+    private String termStart;
+
+    /**
+     * 标准企业名称（清洗名称）
+     */
+    @Excel(name = "标准企业名称", readConverterExp = "清=洗名称")
+    private String formatName;
+
+    /**
+     * 历史名称
+     */
+    @Excel(name = "历史名称")
+    private String historyNames;
+
+
+    /**
+     * 注销日期
+     */
+    @Excel(name = "注销日期")
+    private String endDate;
+
+    /**
+     * 企业注册号
+     */
+    @Excel(name = "企业注册号")
+    private String regNo;
+
+    /**
+     * 企业类型代码
+     */
+    @Excel(name = "企业类型代码")
+    private String econKindCode;
+
+    /**
+     * 地址
+     */
+    @Excel(name = "地址")
+    private String address;
+
+    /**
+     * 组织机构号
+     */
+    @Excel(name = "组织机构号")
+    private String orgNo;
+
+    /**
+     * 地区代码
+     */
+    @Excel(name = "地区代码")
+    private String districtCode;
+
+    /**
+     * 成立日期
+     */
+    @Excel(name = "成立日期")
+    private String startDate;
+
+    /**
+     * 经营范围
+     */
+    @Excel(name = "经营范围")
+    private String scope;
+
+    /**
+     * 企业名称（国家公示）
+     */
+    @Excel(name = "企业名称", readConverterExp = "国=家公示")
+    private String name;
+
+    /**
+     * 统一社会信用代码
+     */
+    @Excel(name = "统一社会信用代码")
+    private String creditNo;
+
+    /**
+     * 经营状态（清洗后状态）
+     */
+    @Excel(name = "经营状态", readConverterExp = "清=洗后状态")
+    private String newStatus;
+
+    /**
+     * 企业法定代表人
+     */
+    @Excel(name = "企业法定代表人")
+    private String operName;
+
+    /**
+     * 公司代表人职务
+     */
+    @Excel(name = "公司代表人职务")
+    private String title;
+
+    /**
+     * 核准日期
+     */
+    @Excel(name = "核准日期")
+    private String checkDate;
+
+    /**
+     * 实缴资本
+     */
+    @Excel(name = "实缴资本")
+    private String actualCapi;
+
+    /**
+     * 营业结束日期
+     */
+    @Excel(name = "营业结束日期")
+    private String termEnd;
+
+    /**
+     * 是否历史
+     */
+    @Excel(name = "是否历史")
+    private Integer isHistory;
+
+    /**
+     * 分支机构信息
+     */
+    @Excel(name = "分支机构信息")
+    private String branches;
+    /**
+     * 分支机构信息
+     */
+    @TableField(exist = false)
+    private List<Map<String,Object>> branchesList;
+
+    /**
+     * 股东信息
+     */
+    @Excel(name = "股东信息")
+    private String partners;
+    /**
+     * 股东信息
+     */
+    @TableField(exist = false)
+    private List<Map<String,Object>> partnersList;
+
+    /**
+     * 主要人员信息
+     */
+    @Excel(name = "主要人员信息")
+    private String employees;
+    /**
+     * 主要人员信息
+     */
+    @TableField(exist = false)
+    private List<Map<String,Object>> employeesList;
+
+    /**
+     * 变更记录
+     */
+    @Excel(name = "变更记录")
+    private String changerecords;
+    /**
+     * 变更记录
+     */
+    @TableField(exist = false)
+    private List<Map<String,Object>> changerecordsList;
+
+    /**
+     * 经营异常信息
+     */
+    @Excel(name = "经营异常信息")
+    private String abnormalItems;
+    /**
+     * 经营异常信息
+     */
+    @TableField(exist = false)
+    private List<Map<String,Object>> abnormalItemsList;
+
+    /**
+     * 企业网址信息
+     */
+    @Excel(name = "企业网址信息")
+    private String websites;
+    /**
+     * 企业网址信息
+     */
+    @TableField(exist = false)
+    private List<Map<String,Object>> websitesList;
+
+    /**
+     * 联系方式
+     */
+    @Excel(name = "联系方式")
+    private String contact;
+    /**
+     * 联系方式
+     */
+    @TableField(exist = false)
+    private Map<String, Object> contactMap;
+
+    /**
+     * 从业人数
+     */
+    @Excel(name = "从业人数")
+    private String colleguesNum;
+
+    /**
+     * 是否上市
+     */
+    @Excel(name = "是否上市")
+    private String isQuoted;
+    /**
+     * 省份缩写
+     */
+    @Excel(name = "省份缩写")
+    private String province;
+    /**
+     * 城市编码
+     */
+    @Excel(name = "城市编码")
+    private String city;
+    /**
+     * 上市类型
+     */
+    @Excel(name = "上市类型")
+    private String quotedType;
+
+    /**
+     * 上市类型
+     */
+    @TableField(exist = false)
+    private List<String> quotedTypeList;
+    /**
+     * 行业
+     */
+    @Excel(name = "行业")
+    private String domains;
+    /**
+     * 行业
+     */
+    @TableField(exist = false)
+    private List<String> domainsList;
+    /**
+     * 行业代码
+     */
+    @Excel(name = "行业代码")
+    private String industryCode;
+
+    /**
+     * 行业代码
+     */
+    @TableField(exist = false)
+    private Map<String, Object> industryCodeMap;
+
+    public List<Map<String, Object>> getBranchesList() {
+        return branchesList;
+    }
+
+    public void setBranchesList(List<Map<String, Object>> branchesList) {
+        this.branchesList = branchesList;
+    }
+
+    public List<Map<String, Object>> getPartnersList() {
+        return partnersList;
+    }
+
+    public void setPartnersList(List<Map<String, Object>> partnersList) {
+        this.partnersList = partnersList;
+    }
+
+    public List<Map<String, Object>> getEmployeesList() {
+        return employeesList;
+    }
+
+    public void setEmployeesList(List<Map<String, Object>> employeesList) {
+        this.employeesList = employeesList;
+    }
+
+    public List<Map<String, Object>> getChangerecordsList() {
+        return changerecordsList;
+    }
+
+    public void setChangerecordsList(List<Map<String, Object>> changerecordsList) {
+        this.changerecordsList = changerecordsList;
+    }
+
+    public List<Map<String, Object>> getAbnormalItemsList() {
+        return abnormalItemsList;
+    }
+
+    public void setAbnormalItemsList(List<Map<String, Object>> abnormalItemsList) {
+        this.abnormalItemsList = abnormalItemsList;
+    }
+
+    public List<Map<String, Object>> getWebsitesList() {
+        return websitesList;
+    }
+
+    public void setWebsitesList(List<Map<String, Object>> websitesList) {
+        this.websitesList = websitesList;
+    }
+
+    public Map<String, Object> getContactMap() {
+        return contactMap;
+    }
+
+    public void setContactMap(Map<String, Object> contactMap) {
+        this.contactMap = contactMap;
+    }
+
+    public List<String> getQuotedTypeList() {
+        return quotedTypeList;
+    }
+
+    public void setQuotedTypeList(List<String> quotedTypeList) {
+        this.quotedTypeList = quotedTypeList;
+    }
+
+    public List<String> getDomainsList() {
+        return domainsList;
+    }
+
+    public void setDomainsList(List<String> domainsList) {
+        this.domainsList = domainsList;
+    }
+
+    public Map<String, Object> getIndustryCodeMap() {
+        return industryCodeMap;
+    }
+
+    public void setIndustryCodeMap(Map<String, Object> industryCodeMap) {
+        this.industryCodeMap = industryCodeMap;
+    }
+
+    public String getIndustryCode() {
+        return industryCode;
+    }
+
+    public void setIndustryCode(String industryCode) {
+        this.industryCode = industryCode;
+    }
+
+    public String getBranches() {
+        return branches;
+    }
+
+    public void setBranches(String branches) {
+        this.branches = branches;
+    }
+
+    public String getPartners() {
+        return partners;
+    }
+
+    public void setPartners(String partners) {
+        this.partners = partners;
+    }
+
+    public String getEmployees() {
+        return employees;
+    }
+
+    public void setEmployees(String employees) {
+        this.employees = employees;
+    }
+
+    public String getChangerecords() {
+        return changerecords;
+    }
+
+    public void setChangerecords(String changerecords) {
+        this.changerecords = changerecords;
+    }
+
+    public String getAbnormalItems() {
+        return abnormalItems;
+    }
+
+    public void setAbnormalItems(String abnormalItems) {
+        this.abnormalItems = abnormalItems;
+    }
+
+    public String getWebsites() {
+        return websites;
+    }
+
+    public void setWebsites(String websites) {
+        this.websites = websites;
+    }
+
+    public String getContact() {
+        return contact;
+    }
+
+    public void setContact(String contact) {
+        this.contact = contact;
+    }
+
+    public String getColleguesNum() {
+        return colleguesNum;
+    }
+
+    public void setColleguesNum(String colleguesNum) {
+        this.colleguesNum = colleguesNum;
+    }
+
+    public String getIsQuoted() {
+        return isQuoted;
+    }
+
+    public void setIsQuoted(String isQuoted) {
+        this.isQuoted = isQuoted;
+    }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getQuotedType() {
+        return quotedType;
+    }
+
+    public void setQuotedType(String quotedType) {
+        this.quotedType = quotedType;
+    }
+
+    public String getDomains() {
+        return domains;
+    }
+
+    public void setDomains(String domains) {
+        this.domains = domains;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setEconKind(String econKind) {
+        this.econKind = econKind;
+    }
+
+    public String getEconKind() {
+        return econKind;
+    }
+
+    public void setRegistCapi(String registCapi) {
+        this.registCapi = registCapi;
+    }
+
+    public String getRegistCapi() {
+        return registCapi;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setBelongOrg(String belongOrg) {
+        this.belongOrg = belongOrg;
+    }
+
+    public String getBelongOrg() {
+        return belongOrg;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setTermStart(String termStart) {
+        this.termStart = termStart;
+    }
+
+    public String getTermStart() {
+        return termStart;
+    }
+
+    public void setFormatName(String formatName) {
+        this.formatName = formatName;
+    }
+
+    public String getFormatName() {
+        return formatName;
+    }
+
+    public void setHistoryNames(String historyNames) {
+        this.historyNames = historyNames;
+    }
+
+    public String getHistoryNames() {
+        return historyNames;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setRegNo(String regNo) {
+        this.regNo = regNo;
+    }
+
+    public String getRegNo() {
+        return regNo;
+    }
+
+    public void setEconKindCode(String econKindCode) {
+        this.econKindCode = econKindCode;
+    }
+
+    public String getEconKindCode() {
+        return econKindCode;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setOrgNo(String orgNo) {
+        this.orgNo = orgNo;
+    }
+
+    public String getOrgNo() {
+        return orgNo;
+    }
+
+    public void setDistrictCode(String districtCode) {
+        this.districtCode = districtCode;
+    }
+
+    public String getDistrictCode() {
+        return districtCode;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setScope(String scope) {
+        this.scope = scope;
+    }
+
+    public String getScope() {
+        return scope;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setCreditNo(String creditNo) {
+        this.creditNo = creditNo;
+    }
+
+    public String getCreditNo() {
+        return creditNo;
+    }
+
+    public void setNewStatus(String newStatus) {
+        this.newStatus = newStatus;
+    }
+
+    public String getNewStatus() {
+        return newStatus;
+    }
+
+    public void setOperName(String operName) {
+        this.operName = operName;
+    }
+
+    public String getOperName() {
+        return operName;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setCheckDate(String checkDate) {
+        this.checkDate = checkDate;
+    }
+
+    public String getCheckDate() {
+        return checkDate;
+    }
+
+    public void setActualCapi(String actualCapi) {
+        this.actualCapi = actualCapi;
+    }
+
+    public String getActualCapi() {
+        return actualCapi;
+    }
+
+    public void setTermEnd(String termEnd) {
+        this.termEnd = termEnd;
+    }
+
+    public String getTermEnd() {
+        return termEnd;
+    }
+
+    public void setIsHistory(Integer isHistory) {
+        this.isHistory = isHistory;
+    }
+
+    public Integer getIsHistory() {
+        return isHistory;
+    }
+
+    @Override
+    public String toString() {
+        return "TEnterpriseInformation{" +
+                "id=" + id +
+                ", delFlag='" + delFlag + '\'' +
+                ", econKind='" + econKind + '\'' +
+                ", registCapi='" + registCapi + '\'' +
+                ", enterpriseId='" + enterpriseId + '\'' +
+                ", belongOrg='" + belongOrg + '\'' +
+                ", status='" + status + '\'' +
+                ", termStart='" + termStart + '\'' +
+                ", formatName='" + formatName + '\'' +
+                ", historyNames='" + historyNames + '\'' +
+                ", endDate='" + endDate + '\'' +
+                ", regNo='" + regNo + '\'' +
+                ", econKindCode='" + econKindCode + '\'' +
+                ", address='" + address + '\'' +
+                ", orgNo='" + orgNo + '\'' +
+                ", districtCode='" + districtCode + '\'' +
+                ", startDate='" + startDate + '\'' +
+                ", scope='" + scope + '\'' +
+                ", name='" + name + '\'' +
+                ", creditNo='" + creditNo + '\'' +
+                ", newStatus='" + newStatus + '\'' +
+                ", operName='" + operName + '\'' +
+                ", title='" + title + '\'' +
+                ", checkDate='" + checkDate + '\'' +
+                ", actualCapi='" + actualCapi + '\'' +
+                ", termEnd='" + termEnd + '\'' +
+                ", isHistory=" + isHistory +
+                ", branches='" + branches + '\'' +
+                ", partners='" + partners + '\'' +
+                ", employees='" + employees + '\'' +
+                ", changerecords='" + changerecords + '\'' +
+                ", abnormalItems='" + abnormalItems + '\'' +
+                ", websites='" + websites + '\'' +
+                ", contact='" + contact + '\'' +
+                ", colleguesNum='" + colleguesNum + '\'' +
+                ", isQuoted='" + isQuoted + '\'' +
+                ", province='" + province + '\'' +
+                ", city='" + city + '\'' +
+                ", quotedType='" + quotedType + '\'' +
+                ", domains='" + domains + '\'' +
+                ", industryCode='" + industryCode + '\'' +
+                '}';
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/mapper/TEnterpriseInformationMapper.java

@@ -0,0 +1,64 @@
+package com.ruoyi.basicData.mapper;
+
+import java.util.List;
+import com.ruoyi.basicData.domain.TEnterpriseInformation;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 企业信息Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-02-25
+ */
+public interface TEnterpriseInformationMapper
+{
+    /**
+     * 查询企业信息
+     *
+     * @param id 企业信息ID
+     * @return 企业信息
+     */
+    public TEnterpriseInformation selectTEnterpriseInformationById(Long id);
+
+    /**
+     * 查询企业信息列表
+     *
+     * @param tEnterpriseInformation 企业信息
+     * @return 企业信息集合
+     */
+    public List<TEnterpriseInformation> selectTEnterpriseInformationList(TEnterpriseInformation tEnterpriseInformation);
+
+    /**
+     * 新增企业信息
+     *
+     * @param tEnterpriseInformation 企业信息
+     * @return 结果
+     */
+    public int insertTEnterpriseInformation(TEnterpriseInformation tEnterpriseInformation);
+
+    /**
+     * 修改企业信息
+     *
+     * @param tEnterpriseInformation 企业信息
+     * @return 结果
+     */
+    public int updateTEnterpriseInformation(TEnterpriseInformation tEnterpriseInformation);
+
+    /**
+     * 删除企业信息
+     *
+     * @param id 企业信息ID
+     * @return 结果
+     */
+    public int deleteTEnterpriseInformationById(Long id);
+
+    /**
+     * 批量删除企业信息
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTEnterpriseInformationByIds(Long[] ids);
+
+    TEnterpriseInformation selectTEnterpriseInformation(@Param("keyword") String keyword);
+}

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/ITEnterpriseInformationService.java

@@ -0,0 +1,65 @@
+package com.ruoyi.basicData.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.basicData.domain.TEnterpriseInformation;
+
+/**
+ * 企业信息Service接口
+ *
+ * @author ruoyi
+ * @date 2025-02-25
+ */
+public interface ITEnterpriseInformationService
+{
+    /**
+     * 查询企业信息
+     *
+     * @param id 企业信息ID
+     * @return 企业信息
+     */
+    public TEnterpriseInformation selectTEnterpriseInformationById(Long id);
+
+    /**
+     * 查询企业信息列表
+     *
+     * @param tEnterpriseInformation 企业信息
+     * @return 企业信息集合
+     */
+    public List<TEnterpriseInformation> selectTEnterpriseInformationList(TEnterpriseInformation tEnterpriseInformation);
+
+    /**
+     * 新增企业信息
+     *
+     * @param tEnterpriseInformation 企业信息
+     * @return 结果
+     */
+    public int insertTEnterpriseInformation(TEnterpriseInformation tEnterpriseInformation);
+
+    /**
+     * 修改企业信息
+     *
+     * @param tEnterpriseInformation 企业信息
+     * @return 结果
+     */
+    public int updateTEnterpriseInformation(TEnterpriseInformation tEnterpriseInformation);
+
+    /**
+     * 批量删除企业信息
+     *
+     * @param ids 需要删除的企业信息ID
+     * @return 结果
+     */
+    public int deleteTEnterpriseInformationByIds(Long[] ids);
+
+    /**
+     * 删除企业信息信息
+     *
+     * @param id 企业信息ID
+     * @return 结果
+     */
+    public int deleteTEnterpriseInformationById(Long id);
+
+    TEnterpriseInformation selectTEnterpriseInformation(String keyword);
+}

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TEnterpriseInformationServiceImpl.java

@@ -0,0 +1,104 @@
+package com.ruoyi.basicData.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.basicData.mapper.TEnterpriseInformationMapper;
+import com.ruoyi.basicData.domain.TEnterpriseInformation;
+import com.ruoyi.basicData.service.ITEnterpriseInformationService;
+
+/**
+ * 企业信息Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-02-25
+ */
+@Service
+public class TEnterpriseInformationServiceImpl implements ITEnterpriseInformationService
+{
+    @Autowired
+    private TEnterpriseInformationMapper tEnterpriseInformationMapper;
+
+    /**
+     * 查询企业信息
+     *
+     * @param id 企业信息ID
+     * @return 企业信息
+     */
+    @Override
+    public TEnterpriseInformation selectTEnterpriseInformationById(Long id)
+    {
+        return tEnterpriseInformationMapper.selectTEnterpriseInformationById(id);
+    }
+
+    /**
+     * 查询企业信息列表
+     *
+     * @param tEnterpriseInformation 企业信息
+     * @return 企业信息
+     */
+    @Override
+    public List<TEnterpriseInformation> selectTEnterpriseInformationList(TEnterpriseInformation tEnterpriseInformation)
+    {
+        return tEnterpriseInformationMapper.selectTEnterpriseInformationList(tEnterpriseInformation);
+    }
+
+    /**
+     * 新增企业信息
+     *
+     * @param tEnterpriseInformation 企业信息
+     * @return 结果
+     */
+    @Override
+    public int insertTEnterpriseInformation(TEnterpriseInformation tEnterpriseInformation)
+    {
+        tEnterpriseInformation.setCreateTime(DateUtils.getNowDate());
+        return tEnterpriseInformationMapper.insertTEnterpriseInformation(tEnterpriseInformation);
+    }
+
+    /**
+     * 修改企业信息
+     *
+     * @param tEnterpriseInformation 企业信息
+     * @return 结果
+     */
+    @Override
+    public int updateTEnterpriseInformation(TEnterpriseInformation tEnterpriseInformation)
+    {
+        tEnterpriseInformation.setUpdateTime(DateUtils.getNowDate());
+        return tEnterpriseInformationMapper.updateTEnterpriseInformation(tEnterpriseInformation);
+    }
+
+    /**
+     * 批量删除企业信息
+     *
+     * @param ids 需要删除的企业信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEnterpriseInformationByIds(Long[] ids)
+    {
+        return tEnterpriseInformationMapper.deleteTEnterpriseInformationByIds(ids);
+    }
+
+    /**
+     * 删除企业信息信息
+     *
+     * @param id 企业信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEnterpriseInformationById(Long id)
+    {
+        return tEnterpriseInformationMapper.deleteTEnterpriseInformationById(id);
+    }
+
+    @Override
+    public TEnterpriseInformation selectTEnterpriseInformation(String keyword) {
+        return tEnterpriseInformationMapper.selectTEnterpriseInformation(keyword);
+    }
+
+}

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/mapper/TWhgenlegMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.reportManagement.mapper;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.reportManagement.domain.TWhgenleg;
 import com.ruoyi.reportManagement.domain.vo.WhgenlegVO;
 import com.ruoyi.reportManagement.excel.Whgenleg;
@@ -340,4 +341,6 @@ public interface TWhgenlegMapper {
     void unlock(String fId);
 
     List<Map<String, Object>> selectInventoryListV1(TWhgenleg tWhgenleg);
+
+    List<TWarehouse> tWarehouseList(TWhgenleg tWhgenleg);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/ITWhgenlegService.java

@@ -2,6 +2,7 @@ package com.ruoyi.reportManagement.service;
 
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.TWarehouse;
 import com.ruoyi.reportManagement.domain.SingleAnalysisExcel;
 import com.ruoyi.reportManagement.domain.SingleAnalysisFeesExcel;
 import com.ruoyi.reportManagement.domain.TWhgenleg;
@@ -220,4 +221,5 @@ public interface ITWhgenlegService {
      */
     public List<Map<String, Object>> biStockDaysInfo(Long warehouseId, Long customerId);
 
+    List<TWarehouse> tWarehouseList(TWhgenleg tWhgenleg);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/impl/TWhgenlegServiceImpl.java

@@ -1159,4 +1159,9 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
         return data;
     }
 
+    @Override
+    public List<TWarehouse> tWarehouseList(TWhgenleg tWhgenleg) {
+        return tWhgenlegMapper.tWarehouseList(tWhgenleg);
+    }
+
 }

ruoyi-warehouse/src/main/resources/mapper/basicData/TEnterpriseInformationMapper.xml

@@ -0,0 +1,276 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.basicData.mapper.TEnterpriseInformationMapper">
+
+    <resultMap type="TEnterpriseInformation" id="TEnterpriseInformationResult">
+        <result property="id"    column="id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="econKind"    column="econ_kind"    />
+        <result property="registCapi"    column="regist_capi"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="belongOrg"    column="belong_org"    />
+        <result property="status"    column="status"    />
+        <result property="termStart"    column="term_start"    />
+        <result property="formatName"    column="format_name"    />
+        <result property="historyNames"    column="history_names"    />
+        <result property="endDate"    column="end_date"    />
+        <result property="regNo"    column="reg_no"    />
+        <result property="econKindCode"    column="econ_kind_code"    />
+        <result property="address"    column="address"    />
+        <result property="orgNo"    column="org_no"    />
+        <result property="districtCode"    column="district_code"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="scope"    column="scope"    />
+        <result property="name"    column="name"    />
+        <result property="creditNo"    column="credit_no"    />
+        <result property="newStatus"    column="new_status"    />
+        <result property="operName"    column="oper_name"    />
+        <result property="checkDate"    column="check_date"    />
+        <result property="actualCapi"    column="actual_capi"    />
+        <result property="termEnd"    column="term_end"    />
+        <result property="isHistory"    column="is_history"    />
+        <result property="domains"    column="domains"    />
+        <result property="quotedType"    column="quoted_type"    />
+        <result property="city"    column="city"    />
+        <result property="province"    column="province"    />
+        <result property="isQuoted"    column="is_quoted"    />
+        <result property="colleguesNum"    column="collegues_num"    />
+        <result property="contact"    column="contact"    />
+        <result property="industryCode"    column="industry_code"    />
+        <result property="websites"    column="websites"    />
+        <result property="abnormalItems"    column="abnormal_items"    />
+        <result property="changerecords"    column="changerecords"    />
+        <result property="employees"    column="employees"    />
+        <result property="partners"    column="partners"    />
+        <result property="branches"    column="branches"    />
+    </resultMap>
+
+    <sql id="selectTEnterpriseInformationVo">
+        select id, del_flag, create_by, create_time, update_by, update_time,
+               econ_kind, regist_capi, enterprise_id, belong_org, status,
+               term_start, format_name, history_names, end_date, reg_no,
+               econ_kind_code, address, org_no, district_code,
+            start_date, scope, name, credit_no, new_status, oper_name, check_date,
+            actual_capi, term_end,is_history,domains,quoted_type,city,province,is_quoted,
+               collegues_num,contact,industry_code,websites,abnormal_items,changerecords,
+               employees,partners,branches from t_enterprise_information
+    </sql>
+
+    <select id="selectTEnterpriseInformationList" parameterType="TEnterpriseInformation" resultMap="TEnterpriseInformationResult">
+        <include refid="selectTEnterpriseInformationVo"/>
+        <where>
+            <if test="econKind != null  and econKind != ''"> and econ_kind = #{econKind}</if>
+            <if test="registCapi != null  and registCapi != ''"> and regist_capi = #{registCapi}</if>
+            <if test="enterpriseId != null  and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
+            <if test="belongOrg != null  and belongOrg != ''"> and belong_org = #{belongOrg}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="termStart != null  and termStart != ''"> and term_start = #{termStart}</if>
+            <if test="formatName != null  and formatName != ''"> and format_name like concat('%', #{formatName}, '%')</if>
+            <if test="historyNames != null  and historyNames != ''"> and history_names = #{historyNames}</if>
+            <if test="endDate != null  and endDate != ''"> and end_date = #{endDate}</if>
+            <if test="regNo != null  and regNo != ''"> and reg_no = #{regNo}</if>
+            <if test="econKindCode != null  and econKindCode != ''"> and econ_kind_code = #{econKindCode}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="orgNo != null  and orgNo != ''"> and org_no = #{orgNo}</if>
+            <if test="districtCode != null  and districtCode != ''"> and district_code = #{districtCode}</if>
+            <if test="startDate != null  and startDate != ''"> and start_date = #{startDate}</if>
+            <if test="scope != null  and scope != ''"> and scope = #{scope}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="creditNo != null  and creditNo != ''"> and credit_no = #{creditNo}</if>
+            <if test="newStatus != null  and newStatus != ''"> and new_status = #{newStatus}</if>
+            <if test="operName != null  and operName != ''"> and oper_name like concat('%', #{operName}, '%')</if>
+            <if test="checkDate != null  and checkDate != ''"> and check_date = #{checkDate}</if>
+            <if test="actualCapi != null  and actualCapi != ''"> and actual_capi = #{actualCapi}</if>
+            <if test="termEnd != null  and termEnd != ''"> and term_end = #{termEnd}</if>
+            <if test="isHistory != null "> and is_history = #{isHistory}</if>
+            <if test="domains != null  and domains != ''"> and domains = #{domains}</if>
+            <if test="quotedType != null  and quotedType != ''"> and quoted_type = #{quotedType}</if>
+            <if test="city != null  and city != ''"> and city = #{city}</if>
+            <if test="province != null  and province != ''"> and province = #{province}</if>
+            <if test="isQuoted != null  and isQuoted != ''"> and is_quoted = #{isQuoted}</if>
+            <if test="colleguesNum != null  and colleguesNum != ''"> and collegues_num = #{colleguesNum}</if>
+            <if test="contact != null  and contact != ''"> and contact = #{contact}</if>
+            <if test="industryCode != null  and industryCode != ''"> and industry_code = #{industryCode}</if>
+            <if test="websites != null  and websites != ''"> and websites = #{websites}</if>
+            <if test="abnormalItems != null  and abnormalItems != ''"> and abnormal_items = #{abnormalItems}</if>
+            <if test="changerecords != null  and changerecords != ''"> and changerecords = #{changerecords}</if>
+            <if test="employees != null  and employees != ''"> and employees = #{employees}</if>
+            <if test="partners != null  and partners != ''"> and partners = #{partners}</if>
+            <if test="branches != null  and branches != ''"> and branches = #{branches}</if>
+        </where>
+    </select>
+
+    <select id="selectTEnterpriseInformationById" parameterType="Long" resultMap="TEnterpriseInformationResult">
+        <include refid="selectTEnterpriseInformationVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectTEnterpriseInformation" resultMap="TEnterpriseInformationResult">
+        <include refid="selectTEnterpriseInformationVo"/>
+        where del_flag = '0'
+        and (name = #{keyword}
+        or reg_no = #{keyword}
+        or credit_no = #{keyword})
+    </select>
+
+    <insert id="insertTEnterpriseInformation" parameterType="TEnterpriseInformation" useGeneratedKeys="true" keyProperty="id">
+        insert into t_enterprise_information
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="econKind != null">econ_kind,</if>
+            <if test="registCapi != null">regist_capi,</if>
+            <if test="enterpriseId != null">enterprise_id,</if>
+            <if test="belongOrg != null">belong_org,</if>
+            <if test="status != null">status,</if>
+            <if test="termStart != null">term_start,</if>
+            <if test="formatName != null">format_name,</if>
+            <if test="historyNames != null">history_names,</if>
+            <if test="endDate != null">end_date,</if>
+            <if test="regNo != null">reg_no,</if>
+            <if test="econKindCode != null">econ_kind_code,</if>
+            <if test="address != null">address,</if>
+            <if test="orgNo != null">org_no,</if>
+            <if test="districtCode != null">district_code,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="scope != null">scope,</if>
+            <if test="name != null">name,</if>
+            <if test="creditNo != null">credit_no,</if>
+            <if test="newStatus != null">new_status,</if>
+            <if test="operName != null">oper_name,</if>
+            <if test="checkDate != null">check_date,</if>
+            <if test="actualCapi != null">actual_capi,</if>
+            <if test="termEnd != null">term_end,</if>
+            <if test="isHistory != null">is_history,</if>
+            <if test="domains != null  and domains != ''">domains,</if>
+            <if test="quotedType != null  and quotedType != ''">quoted_type,</if>
+            <if test="city != null  and city != ''">city,</if>
+            <if test="province != null  and province != ''">province,</if>
+            <if test="isQuoted != null  and isQuoted != ''">is_quoted ,</if>
+            <if test="colleguesNum != null  and colleguesNum != ''">collegues_num ,</if>
+            <if test="contact != null  and contact != ''">contact,</if>
+            <if test="industryCode != null  and industryCode != ''">industry_code,</if>
+            <if test="websites != null  and websites != ''">websites,</if>
+            <if test="abnormalItems != null  and abnormalItems != ''">abnormal_items,</if>
+            <if test="changerecords != null  and changerecords != ''">changerecords ,</if>
+            <if test="employees != null  and employees != ''">employees ,</if>
+            <if test="partners != null  and partners != ''">partners ,</if>
+            <if test="branches != null  and branches != ''">branches,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="econKind != null">#{econKind},</if>
+            <if test="registCapi != null">#{registCapi},</if>
+            <if test="enterpriseId != null">#{enterpriseId},</if>
+            <if test="belongOrg != null">#{belongOrg},</if>
+            <if test="status != null">#{status},</if>
+            <if test="termStart != null">#{termStart},</if>
+            <if test="formatName != null">#{formatName},</if>
+            <if test="historyNames != null">#{historyNames},</if>
+            <if test="endDate != null">#{endDate},</if>
+            <if test="regNo != null">#{regNo},</if>
+            <if test="econKindCode != null">#{econKindCode},</if>
+            <if test="address != null">#{address},</if>
+            <if test="orgNo != null">#{orgNo},</if>
+            <if test="districtCode != null">#{districtCode},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="scope != null">#{scope},</if>
+            <if test="name != null">#{name},</if>
+            <if test="creditNo != null">#{creditNo},</if>
+            <if test="newStatus != null">#{newStatus},</if>
+            <if test="operName != null">#{operName},</if>
+            <if test="checkDate != null">#{checkDate},</if>
+            <if test="actualCapi != null">#{actualCapi},</if>
+            <if test="termEnd != null">#{termEnd},</if>
+            <if test="isHistory != null">#{isHistory},</if>
+            <if test="domains != null  and domains != ''">#{domains},</if>
+            <if test="quotedType != null  and quotedType != ''">#{quotedType},</if>
+            <if test="city != null  and city != ''">#{city},</if>
+            <if test="province != null  and province != ''">#{province},</if>
+            <if test="isQuoted != null  and isQuoted != ''">#{isQuoted},</if>
+            <if test="colleguesNum != null  and colleguesNum != ''">#{colleguesNum},</if>
+            <if test="contact != null  and contact != ''">#{contact},</if>
+            <if test="industryCode != null  and industryCode != ''">#{industryCode},</if>
+            <if test="websites != null  and websites != ''">#{websites},</if>
+            <if test="abnormalItems != null  and abnormalItems != ''">#{abnormalItems},</if>
+            <if test="changerecords != null  and changerecords != ''">#{changerecords},</if>
+            <if test="employees != null  and employees != ''">#{employees},</if>
+            <if test="partners != null  and partners != ''">#{partners},</if>
+            <if test="branches != null  and branches != ''">#{branches},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTEnterpriseInformation" parameterType="TEnterpriseInformation">
+        update t_enterprise_information
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="econKind != null">econ_kind = #{econKind},</if>
+            <if test="registCapi != null">regist_capi = #{registCapi},</if>
+            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
+            <if test="belongOrg != null">belong_org = #{belongOrg},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="termStart != null">term_start = #{termStart},</if>
+            <if test="formatName != null">format_name = #{formatName},</if>
+            <if test="historyNames != null">history_names = #{historyNames},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
+            <if test="regNo != null">reg_no = #{regNo},</if>
+            <if test="econKindCode != null">econ_kind_code = #{econKindCode},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="orgNo != null">org_no = #{orgNo},</if>
+            <if test="districtCode != null">district_code = #{districtCode},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="scope != null">scope = #{scope},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="creditNo != null">credit_no = #{creditNo},</if>
+            <if test="newStatus != null">new_status = #{newStatus},</if>
+            <if test="operName != null">oper_name = #{operName},</if>
+            <if test="checkDate != null">check_date = #{checkDate},</if>
+            <if test="actualCapi != null">actual_capi = #{actualCapi},</if>
+            <if test="termEnd != null">term_end = #{termEnd},</if>
+            <if test="isHistory != null">is_history = #{isHistory},</if>
+            <if test="domains != null  and domains != ''">domains = #{domains},</if>
+            <if test="quotedType != null  and quotedType != ''">quoted_type = #{quotedType},</if>
+            <if test="city != null  and city != ''">city = #{city},</if>
+            <if test="province != null  and province != ''">province = #{province},</if>
+            <if test="isQuoted != null  and isQuoted != ''">is_quoted = #{isQuoted},</if>
+            <if test="colleguesNum != null  and colleguesNum != ''">collegues_num = #{colleguesNum},</if>
+            <if test="contact != null  and contact != ''">contact = #{contact},</if>
+            <if test="industryCode != null  and industryCode != ''">industry_code = #{industryCode},</if>
+            <if test="websites != null  and websites != ''">websites = #{websites},</if>
+            <if test="abnormalItems != null  and abnormalItems != ''">abnormal_items = #{abnormalItems},</if>
+            <if test="changerecords != null  and changerecords != ''">changerecords = #{changerecords},</if>
+            <if test="employees != null  and employees != ''">employees = #{employees},</if>
+            <if test="partners != null  and partners != ''">partners = #{partners},</if>
+            <if test="branches != null  and branches != ''">branches = #{branches},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTEnterpriseInformationById" parameterType="Long">
+        delete from t_enterprise_information where id = #{id}
+    </delete>
+
+    <delete id="deleteTEnterpriseInformationByIds" parameterType="String">
+        delete from t_enterprise_information where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-warehouse/src/main/resources/mapper/reportManagement/TWhgenlegMapper.xml

@@ -808,7 +808,7 @@
             <if test="fGrossweightblc != null ">and leg.f_grossweightblc = #{fGrossweightblc}</if>
             <if test="fNetweightblc != null ">and leg.f_netweightblc = #{fNetweightblc}</if>
             <if test="fCntrno != null  and fCntrno != ''">and leg.f_cntrno LIKE  concat('%', #{fCntrno}, '%')</if>
-            <if test="fMblno != null ">and leg.f_mblno = #{fMblno} </if>
+            <if test="fMblno != null and fMblno != ''">and leg.f_mblno = #{fMblno} </if>
             <if test="fStatus != null  and fStatus != ''">and leg.f_status = #{fStatus}</if>
 
             <if test="fWarehouseid != null ">and leg.f_warehouseid = #{fWarehouseid} </if>
@@ -1950,6 +1950,57 @@
             </if>
         </where>
     </select>
+    <select id="tWarehouseList" resultType="com.ruoyi.common.core.domain.entity.TWarehouse">
+        select
+        ware.*
+        FROM
+        t_whgenleg leg
+        LEFT JOIN t_customer_contact tc ON tc.f_pid = corp.f_id
+        LEFT JOIN t_warehouse ware ON ware.f_id = leg.f_warehouse_locationid
+        <where>
+            leg.f_qtyD != 0
+            and leg.del_flag = '0'
+            AND leg.f_qtyblc != 0
+            AND leg.f_grossweightblc != 0
+            AND leg.f_netweightblc != 0
+            <if test="fOriginalbillno != null  and fOriginalbillno != ''">and leg.f_originalbillno = #{fOriginalbillno}</if>
+            <if test="fTel != null  and fTel != ''">and tc.f_tel = #{fTel}</if>
+            <if test="fPreqty != null ">and leg.f_preqty = #{fPreqty}</if>
+            <if test="fCorpid != null ">and leg.f_corpid = #{fCorpid}</if>
+            <if test="fShipper != null and fShipper != ''">and leg.f_shipper like concat('%', #{fShipper}, '%')</if>
+            <if test="fMblno != null ">and leg.f_mblno LIKE  concat('%', #{fMblno}, '%') </if>
+            <if test='orgStorageDate != null and orgStorageDate[0] != null and orgStorageDate[0]!= ""'>and leg.f_originalbilldate &gt;= #{orgStorageDate[0]}</if>
+            <if test='orgStorageDate != null and orgStorageDate[1] != null and orgStorageDate[1]!= ""'>and leg.f_originalbilldate &lt;= #{orgStorageDate[1]}</if>
+            <if test="fPregrossweight != null ">and leg.f_pregrossweight = #{fPregrossweight}</if>
+            <if test="fPrenetweight != null ">and leg.f_prenetweight = #{fPrenetweight}</if>
+            <if test="fQtyd != null ">and leg.f_qtyD = #{fQtyd}</if>
+            <if test="fTrademodeid != null ">and leg.f_trademodeid = #{fTrademodeid}</if>
+            <if test="fGoodsid != null ">and leg.f_goodsid = #{fGoodsid}</if>
+            <if test="fVolumnd != null ">and leg.f_volumnD = #{fVolumnd}</if>
+            <if test="fGrossweightd != null ">and leg.f_grossweightD = #{fGrossweightd}</if>
+            <if test="fNetweightd != null ">and leg.f_netweightD = #{fNetweightd}</if>
+            <if test="fVolumnc != null ">and leg.f_volumnC = #{fVolumnc}</if>
+            <if test="fQtyc != null ">and leg.f_qtyC = #{fQtyc}</if>
+            <if test="fOriginalbilldate != null ">and leg.f_originalbilldate = #{fOriginalbilldate}</if>
+            <if test="fMarks != null  and fMarks != ''">and leg.f_marks LIKE  concat('%', #{fMarks}, '%')</if>
+            <if test="fQtyblc != null ">and leg.f_qtyblc = #{fQtyblc}</if>
+            <if test="fGrossweightc != null ">and leg.f_grossweightC = #{fGrossweightc}</if>
+            <if test="fNetweightc != null ">and leg.f_netweightC = #{fNetweightc}</if>
+            <if test="fGrossweightblc != null ">and leg.f_grossweightblc = #{fGrossweightblc}</if>
+            <if test="fNetweightblc != null ">and leg.f_netweightblc = #{fNetweightblc}</if>
+            <if test="fStatus != null  and fStatus != ''">and leg.f_status = #{fStatus}</if>
+            <if test="fWarehouseid != null ">and leg.f_warehouseid = #{fWarehouseid} </if>
+            <if test="fLocation != null and fLocation ==1 ">and leg.f_warehouse_locationid = #{fWarehouseLocationid}</if>
+            <if test="checklists != null and checklists !='' ">and leg.checklists = #{checklists}</if>
+            <if test="fCntrno != null  and fCntrno != ''">and leg.f_cntrno  LIKE  concat('%', #{fCntrno}, '%')</if>
+            <if test="fLocalcntrno != null  and fLocalcntrno != ''">and leg.f_localcntrno  LIKE  concat('%', #{fLocalcntrno}, '%')</if>
+            <if test="fLocation != null  and fLocation ==0 ">and ware.ancestors  LIKE  concat('%', #{fWarehouseLocationid}, '%')</if>
+            <if test="isCntrno == 1 ">
+                GROUP BY leg.f_corpid, leg.f_originalbillno, leg.f_originalbilldate, leg.f_warehouse_locationid, leg.f_goodsid, leg.f_trademodeid,leg.f_cntrno,leg.f_marks
+            </if>
+        </where>
+        order by leg.f_bsdate desc
+    </select>
     <update id="changeBelongTo" parameterType="TWhgenleg">
         update t_whgenleg
         <trim prefix="SET" suffixOverrides=",">