2024-05-314 更新

src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java

@@ -104,7 +104,7 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
 
     List<PlmRequestHeaderVo> queryRequestHeader(ChangeRequestVo data);
 
-    List<PlmRequestDetailVo> queryNodeDetailFirst(String site, String workflowId);
+    List<PlmRequestDetailVo> queryNodeDetailFirst(@Param("site") String site, @Param("workflowId") String workflowId, @Param("menuId") String menuId);
 
     int getSeqNo(ProcessFormEntity processFormEntity);
 

src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@@ -745,24 +745,6 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
     @Override
     @Transactional
     public void issueChange(ChangeRequestVo data) {
-//        String ss = "a";
-//        if (ss.equals("a")) {
-//            RequestOperatorInfoParam requestOperatorInfoParam = new RequestOperatorInfoParam();
-//            requestOperatorInfoParam.setUserId("480");
-//            requestOperatorInfoParam.setRequestId("72256");
-//            String getRequestOperatorInfoURL = apiUrlOa + "/oa/interface/getRequestOperatorInfo";
-//            logger.info(requestOperatorInfoParam.toString());
-//            ResponseData getRequestOperatorInfoResponses = HttpClientUtil.doPostByRawWithOA(getRequestOperatorInfoURL, requestOperatorInfoParam);
-//            if (!"0".equals(getRequestOperatorInfoResponses.getCode())) {
-//                throw new RuntimeException("OA获取流程流转信息异常信息：" + getRequestOperatorInfoResponses.getMsg());
-//            }
-//
-//            // 得到全部流转信息
-//            List<Map<String, Object>> res = JSON.parseObject(String.valueOf(getRequestOperatorInfoResponses.getObj()), new TypeReference<List<Map<String, Object>>>(){});
-//            logger.info(res.toString());
-//            throw new RuntimeException("抛个异常");
-//        }
-
 
         // 1、获取当前登陆人的域控账号
         SysUserEntity user = sysUserDao.selectOne(new QueryWrapper<SysUserEntity>().eq("username", data.getUserName()));
@@ -796,10 +778,11 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
 
         // 3.2 获取mainData
         List<MainData> mainData = new ArrayList<>();
-        List<PlmRequestDetailVo> nodeDetails = changeManagementMapper.queryNodeDetailFirst(data.getSite(), workflowId);
-        if (nodeDetails.isEmpty()) {
-            throw new RuntimeException("出口配置获取有误!");
-        }
+        List<PlmRequestDetailVo> nodeDetails = changeManagementMapper.queryNodeDetailFirst(data.getSite(), workflowId, data.getMenuId());
+        logger.info(nodeDetails.toString());
+//        if (nodeDetails.isEmpty()) {
+//            throw new RuntimeException("出口配置获取有误!");
+//        }
 
         // 查出变更单相关表的数据
         //  主信息
@@ -822,6 +805,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
 
         // 根据字段对应的数据库表+字段查询出数据
         for (PlmRequestDetailVo nodeDetail : nodeDetails) {
+//            if (nodeDetail.getPlmTable() == null) {
+//                continue;
+//            }
             MainData md = new MainData();
             StringBuilder fieldValues = new StringBuilder();
             // 获取指定属性值
@@ -833,6 +819,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                     OaUserInfoParam oaUserInfoParam2 = new OaUserInfoParam();
                     oaUserInfoParam2.setLoginId(account);
                     String getOaUserInfoURL2 = apiUrlOa + "/oa/interface/getOaUserInfo";
+                    logger.info(oaUserInfoParam2.toString());
                     ResponseData getOaUserInfoResponse2 = HttpClientUtil.doPostByRawWithOA(getOaUserInfoURL2, oaUserInfoParam2);
                     if (!"0".equals(getOaUserInfoResponse2.getCode())) {
                         throw new RuntimeException("OA接口获取人员异常信息：" + getOaUserInfoResponse2.getMsg());
@@ -841,6 +828,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                     if (result.isEmpty()) {
                         throw new RuntimeException("未获取到域控账号对应的OA人员!");
                     }
+                    logger.info(result2.toString());
                     Map<String, Object> map2 = result2.get(0);
                     String userId2 = (String) map2.get("id");
                     md.setFieldValue(userId2);
@@ -1202,9 +1190,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
             // 创建 mainData
             List<MainData> mainData = new ArrayList<>();
             List<PlmRequestDetailVo> nodeDetails = changeManagementMapper.queryNodeDetails(processFormList.get(0));
-            if (nodeDetails.isEmpty()) {
-                throw new RuntimeException("出口配置获取有误!");
-            }
+//            if (nodeDetails.isEmpty()) {
+//                throw new RuntimeException("出口配置获取有误!");
+//            }
             // 查出变更单相关表的数据
             //  库存成本影响
             ChangeCostImpactVo costImpact = changeManagementMapper.costImpactSearch(changeRequest);

src/main/java/com/spring/modules/customer/service/impl/CustomerAddressServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Service
@@ -47,17 +48,26 @@ public class CustomerAddressServiceImpl extends ServiceImpl<CustomerAddressMappe
     @Override
     public void customerAddressSave(CustomerAddressEntity data) {
         // 判断地址下的默认地址是否已存在
-        customerAddressMapper.selectList(new QueryWrapper<CustomerAddressEntity>()
-                .eq("site", data.getSite())
-                .eq("customer_no", data.getCustomerNo())
-                        .eq("address_type", data.getAddressType())
-                        .eq("address_name", data.getAddressName())
-                .eq("default_address", data.getDefaultAddress()))
-                .stream()
-                .findAny()
-                .ifPresent(a -> {
-                    throw new RuntimeException("该地址已存在这个默认地址！");
-                });
+//        customerAddressMapper.selectList(new QueryWrapper<CustomerAddressEntity>()
+//                .eq("site", data.getSite())
+//                .eq("customer_no", data.getCustomerNo())
+//                        .eq("address_type", data.getAddressType())
+//                        .eq("address_name", data.getAddressName())
+//                .eq("default_address", data.getDefaultAddress()))
+//                .stream()
+//                .findAny()
+//                .ifPresent(a -> {
+//                    throw new RuntimeException("该地址已存在这个默认地址！");
+//                });
+        if ("Y".equals(data.getDefaultAddress())) {
+            List<CustomerAddressEntity> addressList = customerAddressMapper.selectList(new QueryWrapper<CustomerAddressEntity>().eq("site", data.getSite()).eq("customer_no", data.getCustomerNo()));
+            if (!addressList.isEmpty()) {
+                boolean b = addressList.stream().anyMatch(a -> "Y".equals(a.getDefaultAddress()));
+                if (b) {
+                    throw new RuntimeException("该客户已存在默认地址！");
+                }
+            }
+        }
         customerAddressMapper.insert(data);
     }
 
@@ -71,17 +81,26 @@ public class CustomerAddressServiceImpl extends ServiceImpl<CustomerAddressMappe
     @Override
     public void customerAddressEdit(CustomerAddressEntity data) {
         // 判断地址下的默认地址是否已存在
-        customerAddressMapper.selectList(new QueryWrapper<CustomerAddressEntity>()
-                        .eq("site", data.getSite())
-                        .eq("customer_no", data.getCustomerNo())
-                        .eq("address_type", data.getAddressType())
-                        .eq("address_name", data.getAddressName())
-                        .eq("default_address", data.getDefaultAddress()))
-                .stream()
-                .findAny()
-                .ifPresent(a -> {
-                    throw new RuntimeException("该地址已存在这个默认地址！");
-                });
+//        customerAddressMapper.selectList(new QueryWrapper<CustomerAddressEntity>()
+//                        .eq("site", data.getSite())
+//                        .eq("customer_no", data.getCustomerNo())
+//                        .eq("address_type", data.getAddressType())
+//                        .eq("address_name", data.getAddressName())
+//                        .eq("default_address", data.getDefaultAddress()))
+//                .stream()
+//                .findAny()
+//                .ifPresent(a -> {
+//                    throw new RuntimeException("该地址已存在这个默认地址！");
+//                });
+        if ("Y".equals(data.getDefaultAddress())) {
+            List<CustomerAddressEntity> addressList = customerAddressMapper.selectList(new QueryWrapper<CustomerAddressEntity>().eq("site", data.getSite()).eq("customer_no", data.getCustomerNo()));
+            if (!addressList.isEmpty()) {
+                List<CustomerAddressEntity> collect = addressList.stream().filter(a -> "Y".equals(a.getDefaultAddress()) && !Objects.equals(a.getAddressId(), data.getAddressId())).collect(Collectors.toList());
+                if (!collect.isEmpty()) {
+                    throw new RuntimeException("该客户已存在默认地址！");
+                }
+            }
+        }
         customerAddressMapper.updateById(data);
     }
 

src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java

@@ -1221,6 +1221,9 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
     @Override
     public Integer queryMaxOperationNo(RoutingDetailEntity data) {
         RoutingComponentEntity component = routingManagementMapper.queryMaxOperationNo(data);
+        if (component == null) {
+            return 10;
+        }
         return component.getOperationNo() + 10;
     }
 

src/main/resources/mapper/change/ChangeManagementMapper.xml

@@ -694,7 +694,7 @@
             a.site,
             a.bu,
             a.classification_no,
-            a.node_id,
+            b.node_id,
             a.node_name,
             a.create_date,
             a.create_by,
@@ -713,10 +713,11 @@
             a.plm_table,
             a.field_type,
             b.step_id
-        FROM plm_request_node_detail as a
-        LEFT JOIN plm_request_node as b on a.classification_no = b.classification_no and a.node_id = b.node_id
-        WHERE a.site = #{site} and a.workflow_id = #{workflowId}
-        and a.node_id = (select top 1 node_id from plm_request_node where site = #{site} and workflow_id = #{workflowId} order by seq_no)
+        FROM plm_request_header as c
+        left join plm_request_node as b on c.site = b.site and c.bu = b.bu and c.classification_no = b.classification_no
+        LEFT JOIN plm_request_node_detail as a on a.classification_no = b.classification_no and a.node_id = b.node_id
+        WHERE b.site = #{site} and b.workflow_id = #{workflowId} and c.menu_id = #{menuId}
+        and b.node_id = (select top 1 node_id from plm_request_node where site = #{site} and workflow_id = #{workflowId} order by seq_no)
     </select>
 
     <select id="getSeqNo" parameterType="ProcessFormEntity" resultType="int">