工单BOM调整 问题修改

hx-admin/pom.xml

@@ -29,10 +29,10 @@
             <artifactId>hx-supply</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-iot</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fjhx</groupId>-->
+<!--            <artifactId>hx-iot</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.fjhx</groupId>
@@ -64,30 +64,30 @@
             <artifactId>hx-account</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-mail</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fjhx</groupId>-->
+<!--            <artifactId>hx-mail</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.fjhx</groupId>
             <artifactId>hx-sale</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-victoriatourist</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fjhx</groupId>-->
+<!--            <artifactId>hx-victoriatourist</artifactId>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-dingding</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fjhx</groupId>-->
+<!--            <artifactId>hx-dingding</artifactId>-->
+<!--        </dependency>-->
 
-        <dependency>
-            <groupId>com.fjhx</groupId>
-            <artifactId>hx-ehsd</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.fjhx</groupId>-->
+<!--            <artifactId>hx-ehsd</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.fjhx</groupId>

hx-admin/src/test/java/DingDingTest.java

@@ -1,183 +1,183 @@
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.aliyun.dingtalkoauth2_1_0.Client;
-import com.aliyun.dingtalkoauth2_1_0.models.GetCorpAccessTokenRequest;
-import com.aliyun.dingtalkoauth2_1_0.models.GetCorpAccessTokenResponseBody;
-import com.aliyun.tea.TeaException;
-import com.aliyun.teaopenapi.models.Config;
-import com.fjhx.admin.BytesailingApplication;
-import com.fjhx.area.service.CustomizeAreaService;
-import com.fjhx.dingding.constant.Constant;
-import com.fjhx.dingding.service.DingService;
-import com.ruoyi.common.annotation.TenantIgnore;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.framework.mybatis.holder.TenantHolder;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = BytesailingApplication.class)
-@Slf4j
-public class DingDingTest {
-
-
-    @Autowired
-    private DingService dingService;
-
-    @Autowired
-    private CustomizeAreaService customizeAreaService;
-
-    @TenantIgnore
-    @Test
-    public void test1() {
-
-        TenantHolder.setIgnore(true);
-
-        String a = "{ \"bizData\":[\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683798054000,\n" +
-                "            \"biz_type\":4,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19960,\n" +
-                "            \"gmt_modified\":1683798054000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager2795\\\"},\\\"eventId\\\":\\\"e18758c115604987bb7ba2b4621ab34e\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"dingc265ea6f59c8a65524f2f5cc6abecb85\\\",\\\"auth_level\\\":0,\\\"corp_city\\\":\\\"吉隆坡\\\",\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"影音视频\\\",\\\"full_corp_name\\\":\\\"宏星钉测\\\",\\\"corp_name\\\":\\\"宏星钉测\\\",\\\"corp_province\\\":\\\"吉隆坡\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&corpId=dingc265ea6f59c8a65524f2f5cc6abecb85&inviteCode=LWeFQxRHOfULrKM\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581464649,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager2795\\\",\\\"231344025724080775\\\",\\\"1244061748905460\\\"]}]},\\\"permanent_code\\\":\\\"MGUG4eSzQWXajGqyCKlVxeZDly-fIhvIsg-Oe_9RiDAuVZselpxX3utY7KBYJLNx\\\",\\\"syncSeq\\\":\\\"8C4DD3DFE04AAE2FB1E6B2AEF7\\\"}\",\n" +
-                "            \"corp_id\":\"dingc265ea6f59c8a65524f2f5cc6abecb85\",\n" +
-                "            \"status\":0\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683798959000,\n" +
-                "            \"biz_type\":4,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19966,\n" +
-                "            \"gmt_modified\":1683798959000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"0146512911051043578\\\"},\\\"eventId\\\":\\\"04a9b05f50334f9fa51293892e20ed95\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"ding53d823e205604918a39a90f97fcb1e09\\\",\\\"auth_level\\\":1,\\\"corp_city\\\":\\\"福州\\\",\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"计算机软件\\\",\\\"full_corp_name\\\":\\\"福建数字云帆科技有限公司\\\",\\\"corp_name\\\":\\\"福建数字云帆科技有限公司\\\",\\\"corp_province\\\":\\\"福建\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&corpId=ding53d823e205604918a39a90f97fcb1e09&inviteCode=NxLoVevdvDloXGi\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":true,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581336572,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"01392913111186905\\\",\\\"0146512911051043578\\\"]}]},\\\"permanent_code\\\":\\\"-icZLdi8NmOL2Rte7Sh3CqdbBcIOGf6eZtJhFNMRBkBugTISTm7zbP21uspckibW\\\",\\\"syncSeq\\\":\\\"844DD3DFE04AAE2FB1E6B2AEA0\\\"}\",\n" +
-                "            \"corp_id\":\"ding53d823e205604918a39a90f97fcb1e09\",\n" +
-                "            \"status\":0\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683799205000,\n" +
-                "            \"biz_type\":4,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19970,\n" +
-                "            \"gmt_modified\":1683799205000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager6338\\\"},\\\"eventId\\\":\\\"025ca5fb30c9472c8a7ea8211adf78ef\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"dingb543e6dc430497bbee0f45d8e4f7c288\\\",\\\"auth_level\\\":0,\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"\\\",\\\"full_corp_name\\\":\\\"hffff 测试\\\",\\\"corp_name\\\":\\\"hffff 测试\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&corpId=dingb543e6dc430497bbee0f45d8e4f7c288&inviteCode=DVwNu9mv9AowRNZ\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581242807,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager6338\\\"]}]},\\\"permanent_code\\\":\\\"oVS5wid1S_B5JPXGZtiNH_gu0N0Diev6SLWHSaEpvHvClNEua_eIINRMOw2JIUC4\\\",\\\"syncSeq\\\":\\\"874DD3DFE04AA32FA1E6B2AEA5\\\"}\",\n" +
-                "            \"corp_id\":\"dingb543e6dc430497bbee0f45d8e4f7c288\",\n" +
-                "            \"status\":0\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683810014000,\n" +
-                "            \"biz_type\":4,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19981,\n" +
-                "            \"gmt_modified\":1683810014000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager8063\\\"},\\\"eventId\\\":\\\"9cee61dc4e3e4226a424b0f07c593a0e\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"ding379d86d92b0c876eee0f45d8e4f7c288\\\",\\\"auth_level\\\":0,\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"\\\",\\\"full_corp_name\\\":\\\"中星华宸\\\",\\\"corp_name\\\":\\\"中星华宸\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&corpId=ding379d86d92b0c876eee0f45d8e4f7c288&inviteCode=r1zJSofuiKs5eDA\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581402962,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager8063\\\"]}]},\\\"permanent_code\\\":\\\"jZa3L6vaNTyEhmg5ZmAT2Ym9-NUrUjTIp8wSNek2SO8O3bZPGzn9pfDUE0N5E82k\\\",\\\"syncSeq\\\":\\\"804DD3DFE04AAF2F01E6B2AE67\\\"}\",\n" +
-                "            \"corp_id\":\"ding379d86d92b0c876eee0f45d8e4f7c288\",\n" +
-                "            \"status\":0\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683854166000,\n" +
-                "            \"biz_type\":4,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19993,\n" +
-                "            \"gmt_modified\":1683854166000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager7560\\\"},\\\"eventId\\\":\\\"8f508ef39eab4a37b643c0195e8ec862\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"ding3f327504d104ac1cf2c783f7214b6d69\\\",\\\"auth_level\\\":0,\\\"corp_city\\\":\\\"福州\\\",\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"计算机软件\\\",\\\"full_corp_name\\\":\\\"hf测试\\\",\\\"corp_name\\\":\\\"hf测试\\\",\\\"corp_province\\\":\\\"福建\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&corpId=ding3f327504d104ac1cf2c783f7214b6d69&inviteCode=i8yWYDEytZJIkIa\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581273014,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager7560\\\"]}]},\\\"permanent_code\\\":\\\"caY2fuNclujXwRXlDOuctE-4HlOY6hWfgBTnMDbOaCPGQ-yzWQBxE6-axKq9XSJy\\\",\\\"syncSeq\\\":\\\"844DD3DFE04AAD2F91E6B2AEE5\\\"}\",\n" +
-                "            \"corp_id\":\"ding3f327504d104ac1cf2c783f7214b6d69\",\n" +
-                "            \"status\":0\n" +
-                "        },\n" +
-                "        {\n" +
-                "            \"gmt_create\":1683854404000,\n" +
-                "            \"biz_type\":2,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19994,\n" +
-                "            \"gmt_modified\":1683854404000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"eventId\\\":\\\"e50ed7cdf209448fa567e523bfc52b83\\\",\\\"syncAction\\\":\\\"suite_ticket\\\",\\\"suiteTicket\\\":\\\"2SwvImnFmDGqrCpEdmHeOjwBpBBj0o30nJmsqzMGUD3HJ2zMqckkTwlzM40GycbsjBKE0h2wUQHb3AQMrRtzCl\\\",\\\"syncSeq\\\":\\\"2AEA5DA284BB85DEE8CA8D33A9\\\"}\",\n" +
-                "            \"corp_id\":\"ding53d823e205604918a39a90f97fcb1e09\",\n" +
-                "            \"status\":0\n" +
-                "        }\n" +
-                "    ]}";
-
-
-        dingService.pushHigh(JSON.parseObject(a));
-
-        System.out.println();
-
-    }
-
-    public static void main(String[] args) {
-        String a = "{ \"bizData\":[        {\n" +
-                "            \"gmt_create\":1683854404000,\n" +
-                "            \"biz_type\":2,\n" +
-                "            \"open_cursor\":0,\n" +
-                "            \"subscribe_id\":\"30319001_0\",\n" +
-                "            \"id\":19994,\n" +
-                "            \"gmt_modified\":1683854404000,\n" +
-                "            \"biz_id\":\"30319001\",\n" +
-                "            \"biz_data\":\"{\\\"eventId\\\":\\\"e50ed7cdf209448fa567e523bfc52b83\\\",\\\"syncAction\\\":\\\"suite_ticket\\\",\\\"suiteTicket\\\":\\\"2SwvImnFmDGqrCpEdmHeOjwBpBBj0o30nJmsqzMGUD3HJ2zMqckkTwlzM40GycbsjBKE0h2wUQHb3AQMrRtzCl\\\",\\\"syncSeq\\\":\\\"2AEA5DA284BB85DEE8CA8D33A9\\\"}\",\n" +
-                "            \"corp_id\":\"ding53d823e205604918a39a90f97fcb1e09\",\n" +
-                "            \"status\":0\n" +
-                "        }]}";
-        System.out.println(JSON.parse(a));
-    }
-
-
-    private static String test1(String corpId) {
-        GetCorpAccessTokenRequest getCorpAccessTokenRequest = new GetCorpAccessTokenRequest()
-                .setSuiteKey(Constant.SUITE_KEY)
-                .setSuiteSecret(Constant.SUITE_SECRET)
-                .setAuthCorpId(corpId)
-                .setSuiteTicket("2SwvImnFmDGqrCpEdmHeOjwBpBBj0o30nJmsqzMGUD3HJ2zMqckkTwlzM40GycbsjBKE0h2wUQHb3AQMrRtzCl");
-
-        try {
-            Client client = getClient2();
-            GetCorpAccessTokenResponseBody body = client.getCorpAccessToken(getCorpAccessTokenRequest).getBody();
-            return body.getAccessToken();
-        } catch (Exception e) {
-
-            TeaException teaException;
-
-            if (e instanceof TeaException) {
-                teaException = (TeaException) e;
-            } else {
-                teaException = new TeaException(e.getMessage(), e);
-            }
-
-            String errCode = teaException.getCode();
-            String errMsg = teaException.getMessage();
-
-            if (StrUtil.isAllNotBlank(errCode, errMsg)) {
-                log.error("钉钉授权认证失败： code：{}，message：{}", errCode, errMsg);
-                throw new ServiceException(errMsg);
-            } else {
-                log.error("钉钉授权认证失败", teaException);
-                throw new ServiceException("发生未知异常，钉钉授权认证失败");
-            }
-
-        }
-    }
-
-
-    private static com.aliyun.dingtalkoauth2_1_0.Client getClient2() throws Exception {
-        Config config = new Config();
-        config.protocol = "https";
-        config.regionId = "central";
-        return new com.aliyun.dingtalkoauth2_1_0.Client(config);
-    }
-
-}
+//import cn.hutool.core.util.StrUtil;
+//import com.alibaba.fastjson.JSON;
+//import com.aliyun.dingtalkoauth2_1_0.Client;
+//import com.aliyun.dingtalkoauth2_1_0.models.GetCorpAccessTokenRequest;
+//import com.aliyun.dingtalkoauth2_1_0.models.GetCorpAccessTokenResponseBody;
+//import com.aliyun.tea.TeaException;
+//import com.aliyun.teaopenapi.models.Config;
+//import com.fjhx.admin.BytesailingApplication;
+//import com.fjhx.area.service.CustomizeAreaService;
+//import com.fjhx.dingding.constant.Constant;
+//import com.fjhx.dingding.service.DingService;
+//import com.ruoyi.common.annotation.TenantIgnore;
+//import com.ruoyi.common.exception.ServiceException;
+//import com.ruoyi.framework.mybatis.holder.TenantHolder;
+//import lombok.extern.slf4j.Slf4j;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//
+//@RunWith(SpringRunner.class)
+//@SpringBootTest(classes = BytesailingApplication.class)
+//@Slf4j
+//public class DingDingTest {
+//
+//
+//    @Autowired
+//    private DingService dingService;
+//
+//    @Autowired
+//    private CustomizeAreaService customizeAreaService;
+//
+//    @TenantIgnore
+//    @Test
+//    public void test1() {
+//
+//        TenantHolder.setIgnore(true);
+//
+//        String a = "{ \"bizData\":[\n" +
+//                "        {\n" +
+//                "            \"gmt_create\":1683798054000,\n" +
+//                "            \"biz_type\":4,\n" +
+//                "            \"open_cursor\":0,\n" +
+//                "            \"subscribe_id\":\"30319001_0\",\n" +
+//                "            \"id\":19960,\n" +
+//                "            \"gmt_modified\":1683798054000,\n" +
+//                "            \"biz_id\":\"30319001\",\n" +
+//                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager2795\\\"},\\\"eventId\\\":\\\"e18758c115604987bb7ba2b4621ab34e\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"dingc265ea6f59c8a65524f2f5cc6abecb85\\\",\\\"auth_level\\\":0,\\\"corp_city\\\":\\\"吉隆坡\\\",\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"影音视频\\\",\\\"full_corp_name\\\":\\\"宏星钉测\\\",\\\"corp_name\\\":\\\"宏星钉测\\\",\\\"corp_province\\\":\\\"吉隆坡\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&corpId=dingc265ea6f59c8a65524f2f5cc6abecb85&inviteCode=LWeFQxRHOfULrKM\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581464649,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager2795\\\",\\\"231344025724080775\\\",\\\"1244061748905460\\\"]}]},\\\"permanent_code\\\":\\\"MGUG4eSzQWXajGqyCKlVxeZDly-fIhvIsg-Oe_9RiDAuVZselpxX3utY7KBYJLNx\\\",\\\"syncSeq\\\":\\\"8C4DD3DFE04AAE2FB1E6B2AEF7\\\"}\",\n" +
+//                "            \"corp_id\":\"dingc265ea6f59c8a65524f2f5cc6abecb85\",\n" +
+//                "            \"status\":0\n" +
+//                "        },\n" +
+//                "        {\n" +
+//                "            \"gmt_create\":1683798959000,\n" +
+//                "            \"biz_type\":4,\n" +
+//                "            \"open_cursor\":0,\n" +
+//                "            \"subscribe_id\":\"30319001_0\",\n" +
+//                "            \"id\":19966,\n" +
+//                "            \"gmt_modified\":1683798959000,\n" +
+//                "            \"biz_id\":\"30319001\",\n" +
+//                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"0146512911051043578\\\"},\\\"eventId\\\":\\\"04a9b05f50334f9fa51293892e20ed95\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"ding53d823e205604918a39a90f97fcb1e09\\\",\\\"auth_level\\\":1,\\\"corp_city\\\":\\\"福州\\\",\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"计算机软件\\\",\\\"full_corp_name\\\":\\\"福建数字云帆科技有限公司\\\",\\\"corp_name\\\":\\\"福建数字云帆科技有限公司\\\",\\\"corp_province\\\":\\\"福建\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&corpId=ding53d823e205604918a39a90f97fcb1e09&inviteCode=NxLoVevdvDloXGi\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":true,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581336572,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"01392913111186905\\\",\\\"0146512911051043578\\\"]}]},\\\"permanent_code\\\":\\\"-icZLdi8NmOL2Rte7Sh3CqdbBcIOGf6eZtJhFNMRBkBugTISTm7zbP21uspckibW\\\",\\\"syncSeq\\\":\\\"844DD3DFE04AAE2FB1E6B2AEA0\\\"}\",\n" +
+//                "            \"corp_id\":\"ding53d823e205604918a39a90f97fcb1e09\",\n" +
+//                "            \"status\":0\n" +
+//                "        },\n" +
+//                "        {\n" +
+//                "            \"gmt_create\":1683799205000,\n" +
+//                "            \"biz_type\":4,\n" +
+//                "            \"open_cursor\":0,\n" +
+//                "            \"subscribe_id\":\"30319001_0\",\n" +
+//                "            \"id\":19970,\n" +
+//                "            \"gmt_modified\":1683799205000,\n" +
+//                "            \"biz_id\":\"30319001\",\n" +
+//                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager6338\\\"},\\\"eventId\\\":\\\"025ca5fb30c9472c8a7ea8211adf78ef\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"dingb543e6dc430497bbee0f45d8e4f7c288\\\",\\\"auth_level\\\":0,\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"\\\",\\\"full_corp_name\\\":\\\"hffff 测试\\\",\\\"corp_name\\\":\\\"hffff 测试\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&corpId=dingb543e6dc430497bbee0f45d8e4f7c288&inviteCode=DVwNu9mv9AowRNZ\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581242807,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager6338\\\"]}]},\\\"permanent_code\\\":\\\"oVS5wid1S_B5JPXGZtiNH_gu0N0Diev6SLWHSaEpvHvClNEua_eIINRMOw2JIUC4\\\",\\\"syncSeq\\\":\\\"874DD3DFE04AA32FA1E6B2AEA5\\\"}\",\n" +
+//                "            \"corp_id\":\"dingb543e6dc430497bbee0f45d8e4f7c288\",\n" +
+//                "            \"status\":0\n" +
+//                "        },\n" +
+//                "        {\n" +
+//                "            \"gmt_create\":1683810014000,\n" +
+//                "            \"biz_type\":4,\n" +
+//                "            \"open_cursor\":0,\n" +
+//                "            \"subscribe_id\":\"30319001_0\",\n" +
+//                "            \"id\":19981,\n" +
+//                "            \"gmt_modified\":1683810014000,\n" +
+//                "            \"biz_id\":\"30319001\",\n" +
+//                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager8063\\\"},\\\"eventId\\\":\\\"9cee61dc4e3e4226a424b0f07c593a0e\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"ding379d86d92b0c876eee0f45d8e4f7c288\\\",\\\"auth_level\\\":0,\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"\\\",\\\"full_corp_name\\\":\\\"中星华宸\\\",\\\"corp_name\\\":\\\"中星华宸\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&corpId=ding379d86d92b0c876eee0f45d8e4f7c288&inviteCode=r1zJSofuiKs5eDA\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581402962,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager8063\\\"]}]},\\\"permanent_code\\\":\\\"jZa3L6vaNTyEhmg5ZmAT2Ym9-NUrUjTIp8wSNek2SO8O3bZPGzn9pfDUE0N5E82k\\\",\\\"syncSeq\\\":\\\"804DD3DFE04AAF2F01E6B2AE67\\\"}\",\n" +
+//                "            \"corp_id\":\"ding379d86d92b0c876eee0f45d8e4f7c288\",\n" +
+//                "            \"status\":0\n" +
+//                "        },\n" +
+//                "        {\n" +
+//                "            \"gmt_create\":1683854166000,\n" +
+//                "            \"biz_type\":4,\n" +
+//                "            \"open_cursor\":0,\n" +
+//                "            \"subscribe_id\":\"30319001_0\",\n" +
+//                "            \"id\":19993,\n" +
+//                "            \"gmt_modified\":1683854166000,\n" +
+//                "            \"biz_id\":\"30319001\",\n" +
+//                "            \"biz_data\":\"{\\\"auth_user_info\\\":{\\\"userId\\\":\\\"manager7560\\\"},\\\"eventId\\\":\\\"8f508ef39eab4a37b643c0195e8ec862\\\",\\\"auth_corp_info\\\":{\\\"corp_type\\\":0,\\\"corpid\\\":\\\"ding3f327504d104ac1cf2c783f7214b6d69\\\",\\\"auth_level\\\":0,\\\"corp_city\\\":\\\"福州\\\",\\\"auth_channel\\\":\\\"4\\\",\\\"industry\\\":\\\"计算机软件\\\",\\\"full_corp_name\\\":\\\"hf测试\\\",\\\"corp_name\\\":\\\"hf测试\\\",\\\"corp_province\\\":\\\"福建\\\",\\\"is_ecological_corp\\\":false,\\\"invite_url\\\":\\\"https://wx-in-i.dingtalk.com/invite-page/weixin.html?bizSource=____source____&corpId=ding3f327504d104ac1cf2c783f7214b6d69&inviteCode=i8yWYDEytZJIkIa\\\",\\\"auth_channel_type\\\":\\\"\\\",\\\"corp_type_v2\\\":0,\\\"invite_code\\\":\\\"\\\",\\\"is_authenticated\\\":false,\\\"license_code\\\":\\\"\\\",\\\"corp_logo_url\\\":\\\"\\\"},\\\"syncAction\\\":\\\"org_suite_auth\\\",\\\"auth_scope\\\":{\\\"errcode\\\":0,\\\"condition_field\\\":[],\\\"auth_user_field\\\":[\\\"jobnumber\\\",\\\"isLeader\\\",\\\"name\\\",\\\"isAdmin\\\",\\\"avatar\\\",\\\"position\\\",\\\"department\\\",\\\"userid\\\",\\\"deviceId\\\",\\\"isHide\\\"],\\\"auth_org_scopes\\\":{\\\"authed_user\\\":[],\\\"authed_dept\\\":[1]},\\\"errmsg\\\":\\\"ok\\\"},\\\"auth_info\\\":{\\\"agent\\\":[{\\\"agentid\\\":2581273014,\\\"agent_name\\\":\\\"byteSailing_test\\\",\\\"logo_url\\\":\\\"https://static-legacy.dingtalk.com/media/lALPDfJ6cdfiyqfNAZDNAZA_400_400.png\\\",\\\"appid\\\":131175,\\\"use_app_role\\\":false,\\\"admin_list\\\":[\\\"manager7560\\\"]}]},\\\"permanent_code\\\":\\\"caY2fuNclujXwRXlDOuctE-4HlOY6hWfgBTnMDbOaCPGQ-yzWQBxE6-axKq9XSJy\\\",\\\"syncSeq\\\":\\\"844DD3DFE04AAD2F91E6B2AEE5\\\"}\",\n" +
+//                "            \"corp_id\":\"ding3f327504d104ac1cf2c783f7214b6d69\",\n" +
+//                "            \"status\":0\n" +
+//                "        },\n" +
+//                "        {\n" +
+//                "            \"gmt_create\":1683854404000,\n" +
+//                "            \"biz_type\":2,\n" +
+//                "            \"open_cursor\":0,\n" +
+//                "            \"subscribe_id\":\"30319001_0\",\n" +
+//                "            \"id\":19994,\n" +
+//                "            \"gmt_modified\":1683854404000,\n" +
+//                "            \"biz_id\":\"30319001\",\n" +
+//                "            \"biz_data\":\"{\\\"eventId\\\":\\\"e50ed7cdf209448fa567e523bfc52b83\\\",\\\"syncAction\\\":\\\"suite_ticket\\\",\\\"suiteTicket\\\":\\\"2SwvImnFmDGqrCpEdmHeOjwBpBBj0o30nJmsqzMGUD3HJ2zMqckkTwlzM40GycbsjBKE0h2wUQHb3AQMrRtzCl\\\",\\\"syncSeq\\\":\\\"2AEA5DA284BB85DEE8CA8D33A9\\\"}\",\n" +
+//                "            \"corp_id\":\"ding53d823e205604918a39a90f97fcb1e09\",\n" +
+//                "            \"status\":0\n" +
+//                "        }\n" +
+//                "    ]}";
+//
+//
+//        dingService.pushHigh(JSON.parseObject(a));
+//
+//        System.out.println();
+//
+//    }
+//
+//    public static void main(String[] args) {
+//        String a = "{ \"bizData\":[        {\n" +
+//                "            \"gmt_create\":1683854404000,\n" +
+//                "            \"biz_type\":2,\n" +
+//                "            \"open_cursor\":0,\n" +
+//                "            \"subscribe_id\":\"30319001_0\",\n" +
+//                "            \"id\":19994,\n" +
+//                "            \"gmt_modified\":1683854404000,\n" +
+//                "            \"biz_id\":\"30319001\",\n" +
+//                "            \"biz_data\":\"{\\\"eventId\\\":\\\"e50ed7cdf209448fa567e523bfc52b83\\\",\\\"syncAction\\\":\\\"suite_ticket\\\",\\\"suiteTicket\\\":\\\"2SwvImnFmDGqrCpEdmHeOjwBpBBj0o30nJmsqzMGUD3HJ2zMqckkTwlzM40GycbsjBKE0h2wUQHb3AQMrRtzCl\\\",\\\"syncSeq\\\":\\\"2AEA5DA284BB85DEE8CA8D33A9\\\"}\",\n" +
+//                "            \"corp_id\":\"ding53d823e205604918a39a90f97fcb1e09\",\n" +
+//                "            \"status\":0\n" +
+//                "        }]}";
+//        System.out.println(JSON.parse(a));
+//    }
+//
+//
+//    private static String test1(String corpId) {
+//        GetCorpAccessTokenRequest getCorpAccessTokenRequest = new GetCorpAccessTokenRequest()
+//                .setSuiteKey(Constant.SUITE_KEY)
+//                .setSuiteSecret(Constant.SUITE_SECRET)
+//                .setAuthCorpId(corpId)
+//                .setSuiteTicket("2SwvImnFmDGqrCpEdmHeOjwBpBBj0o30nJmsqzMGUD3HJ2zMqckkTwlzM40GycbsjBKE0h2wUQHb3AQMrRtzCl");
+//
+//        try {
+//            Client client = getClient2();
+//            GetCorpAccessTokenResponseBody body = client.getCorpAccessToken(getCorpAccessTokenRequest).getBody();
+//            return body.getAccessToken();
+//        } catch (Exception e) {
+//
+//            TeaException teaException;
+//
+//            if (e instanceof TeaException) {
+//                teaException = (TeaException) e;
+//            } else {
+//                teaException = new TeaException(e.getMessage(), e);
+//            }
+//
+//            String errCode = teaException.getCode();
+//            String errMsg = teaException.getMessage();
+//
+//            if (StrUtil.isAllNotBlank(errCode, errMsg)) {
+//                log.error("钉钉授权认证失败： code：{}，message：{}", errCode, errMsg);
+//                throw new ServiceException(errMsg);
+//            } else {
+//                log.error("钉钉授权认证失败", teaException);
+//                throw new ServiceException("发生未知异常，钉钉授权认证失败");
+//            }
+//
+//        }
+//    }
+//
+//
+//    private static com.aliyun.dingtalkoauth2_1_0.Client getClient2() throws Exception {
+//        Config config = new Config();
+//        config.protocol = "https";
+//        config.regionId = "central";
+//        return new com.aliyun.dingtalkoauth2_1_0.Client(config);
+//    }
+//
+//}

hx-mes/src/main/java/com/fjhx/mes/service/bom/impl/BomInfoServiceImpl.java

@@ -115,7 +115,7 @@ public class BomInfoServiceImpl extends ServiceImpl<BomInfoMapper, BomInfo> impl
         BomInfoVo result = BeanUtil.toBean(bomInfo, BomInfoVo.class);
 
         List<BomDetail> bomDetailList = bomDetailService.list(q -> q
-                .eq(BomDetail::getType, dto.getType())
+                .eq(ObjectUtil.isNotEmpty(dto.getType()),BomDetail::getType, dto.getType())
                 .eq(BomDetail::getBomInfoId, dto.getId())
         );
         List<BomDetailVo> bomDetailVoList = BeanUtil.copyToList(bomDetailList, BomDetailVo.class);

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderBomServiceImpl.java

@@ -58,14 +58,12 @@ public class WorkOrderBomServiceImpl extends ServiceImpl<WorkOrderBomMapper, Wor
         if (ObjectUtil.isEmpty(workOrderBomList)) {
             //如果不存在定制BOM就查询基本BOM信息
             BomInfo bomInfo = bomInfoService.getOne(q -> q.eq(BomInfo::getProductId, workOrder.getProductId()).eq(BomInfo::getCurrentVersion, 1));
-            if (ObjectUtil.isEmpty(bomInfo)) {
-                throw new ServiceException("查询不到产品基本BOM信息");
+            if (ObjectUtil.isNotEmpty(bomInfo)) {
+                List<BomDetail> bomDetailList = bomDetailService.list(q -> q.eq(BomDetail::getBomInfoId, bomInfo.getId()));
+                if (ObjectUtil.isNotEmpty(bomDetailList)) {
+                    workOrderBomList = BeanUtil.copyToList(bomDetailList, WorkOrderBom.class);
+                }
             }
-            List<BomDetail> bomDetailList = bomDetailService.list(q -> q.eq(BomDetail::getBomInfoId, bomInfo.getId()));
-            if (ObjectUtil.isEmpty(bomDetailList)) {
-                throw new ServiceException("查询不到产品基本BOM明细信息");
-            }
-            workOrderBomList = BeanUtil.copyToList(bomDetailList, WorkOrderBom.class);
 //            for (WorkOrderBom workOrderBomVo : workOrderBomList) {
 //                workOrderBomVo.setId(null);//清空id
 //            }

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -123,18 +123,18 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         //创建计划时工单要满足以下条件才能下工单
         if (ObjectUtil.isNotEmpty(dto.getIsHandle())) {
             //研发已上传附件
-            wrapper.eq("wo",WorkOrder::getResearchStatus,1);
+            wrapper.eq("wo", WorkOrder::getResearchStatus, 1);
             //研发已调整BOM
-            wrapper.eq("wo",WorkOrder::getResearchBomStatus,1);
+            wrapper.eq("wo", WorkOrder::getResearchBomStatus, 1);
             //电工（电控）已调整BOM
-            wrapper.eq("wo",WorkOrder::getElectricianBomStatus,1);
+            wrapper.eq("wo", WorkOrder::getElectricianBomStatus, 1);
             //制图已经调整定制工序[定制工单]
-            wrapper.eq("wo",WorkOrder::getTechnologyStatus,1);
+            wrapper.eq("wo", WorkOrder::getTechnologyStatus, 1);
             //制图已经调整定制BOM[定制工单]
-            wrapper.eq("wo",WorkOrder::getBomStatus,1);
+            wrapper.eq("wo", WorkOrder::getBomStatus, 1);
             //制图已下发生产（生产数量不为空）
             wrapper.isNotNull("wo.production_quantity");
-            wrapper.ne("wo.production_quantity","");
+            wrapper.ne("wo.production_quantity", "");
         }
 
         //过滤待排程（待创建计划的工单）
@@ -324,7 +324,6 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     }
 
 
-
     /**
      * 下发需要人工干预的工单
      */
@@ -497,24 +496,28 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
     @DSTransactional
     public synchronized void editBom(WorkOrderBomDto workOrderBomDto) {
         Long workOrderId = workOrderBomDto.getWorkOrderId();
-        Assert.notEmpty(workOrderId,"工单Id不能为空");
+        Assert.notEmpty(workOrderId, "工单Id不能为空");
         WorkOrder workOrder = this.getById(workOrderId);
-        Assert.notEmpty(workOrder,"查询不到工单信息");
+        Assert.notEmpty(workOrder, "查询不到工单信息");
 
         //修改状态
         Integer researchBomStatus = workOrderBomDto.getResearchBomStatus();
         Integer electricianBomStatus = workOrderBomDto.getElectricianBomStatus();
-        this.update(q->q
-                .eq(WorkOrder::getId,workOrderId)
-                .set(ObjectUtil.isNotEmpty(researchBomStatus),WorkOrder::getResearchBomStatus, researchBomStatus)
-                .set(ObjectUtil.isNotEmpty(electricianBomStatus),WorkOrder::getElectricianBomStatus, electricianBomStatus)
+        Integer bomStatus = workOrderBomDto.getBomStatus();
+        this.update(q -> q
+                .eq(WorkOrder::getId, workOrderId)
+                .set(ObjectUtil.isNotEmpty(researchBomStatus), WorkOrder::getResearchBomStatus, researchBomStatus)
+                .set(ObjectUtil.isNotEmpty(electricianBomStatus), WorkOrder::getElectricianBomStatus, electricianBomStatus)
+                .set(ObjectUtil.isNotEmpty(bomStatus), WorkOrder::getBomStatus, bomStatus)
+                .set(WorkOrder::getUpdateTime, new Date())
+                .set(WorkOrder::getUpdateUser, SecurityUtils.getUserId())
         );
 
         //判断定制还是非定制
-        if(Objects.equals(workOrder.getIsCustomized(),"1")){
+        if (Objects.equals(workOrder.getIsCustomized(), "1")) {
             //定制-修改定制BOM
             workOrderBomService.edit(workOrderBomDto);
-        }else{
+        } else {
             //非定制-修改普通BOM
             List<WorkOrderBom> workOrderBomList = workOrderBomDto.getWorkOrderBomList();
             //将数据转换成普通BOM
@@ -524,11 +527,11 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
 
             //查询基本BOM
             BomInfo bomInfo = bomInfoService.getOne(q -> q.eq(BomInfo::getProductId, workOrder.getProductId()).eq(BomInfo::getCurrentVersion, 1));
-            if(ObjectUtil.isNotEmpty(bomInfo)){
+            if (ObjectUtil.isNotEmpty(bomInfo)) {
                 //修改
                 bomInfoDto.setId(bomInfo.getId());
                 bomInfoService.editByJxst(bomInfoDto);
-            }else{
+            } else {
                 //添加
                 bomInfoDto.setAddType(1);
                 bomInfoDto.setProductId(workOrder.getProductId());

hx-mes/src/main/resources/mapper/work/WorkOrderMapper.xml

@@ -23,6 +23,8 @@
                      wo.production_quantity,
                      wo.stock_wait_quantity,
                      wo.research_status,
+                     wo.research_bom_status,
+                     wo.electrician_bom_status,
                      sc.dev_user_id
               FROM work_order wo
                        LEFT JOIN bytesailing_jxst.sales_contract sc ON wo.source_id = sc.id

pom.xml

@@ -14,11 +14,11 @@
         <module>code</module>
         <module>hx-admin</module>
         <module>hx-customer</module>
-        <module>hx-ehsd</module>
-        <module>hx-finance</module>
-        <module>hx-iot</module>
+<!--        <module>hx-ehsd</module>-->
+<!--        <module>hx-finance</module>-->
+<!--        <module>hx-iot</module>-->
         <module>hx-item</module>
-        <module>hx-mail</module>
+<!--        <module>hx-mail</module>-->
         <module>hx-mes</module>
         <module>hx-supply</module>
         <module>hx-wms</module>
@@ -27,9 +27,9 @@
         <module>hx-purchase</module>
         <module>hx-account</module>
         <module>hx-sale</module>
-        <module>hx-victoriatourist</module>
-        <module>hx-dingding</module>
-        <module>hx-data</module>
+<!--        <module>hx-victoriatourist</module>-->
+<!--        <module>hx-dingding</module>-->
+<!--        <module>hx-data</module>-->
         <module>hx-jxst</module>
         <module>hx-form</module>
     </modules>
@@ -70,31 +70,31 @@
                 <artifactId>hx-customer</artifactId>
                 <version>${hx.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-ehsd</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-finance</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-iot</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-ehsd</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-finance</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-iot</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>hx-item</artifactId>
                 <version>${hx.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-mail</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-mail</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>hx-mes</artifactId>
@@ -140,23 +140,23 @@
                 <version>${hx.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-victoriatourist</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-victoriatourist</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
 
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-dingding</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-dingding</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
 
-            <dependency>
-                <groupId>com.fjhx</groupId>
-                <artifactId>hx-data</artifactId>
-                <version>${hx.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.fjhx</groupId>-->
+<!--                <artifactId>hx-data</artifactId>-->
+<!--                <version>${hx.version}</version>-->
+<!--            </dependency>-->
 
             <dependency>
                 <groupId>com.fjhx</groupId>