BUG 修尬

src/main/java/com/spring/ifs/bean/BaseSearchBean.java

@@ -167,7 +167,7 @@ public class BaseSearchBean {
             InventoryPartUnitCostSumVo resultRow = BaseSearchApi.getInventoryValueByPartNo(srv, site, partNo);
             //判断null
             if(resultRow == null) {
-                throw new APException("库存机按成本不存在!");
+                throw new APException("库存件按成本不存在!");
             }
             returnMap.put("resultCode", "200");
             returnMap.put("obj", JSON.toJSONString(resultRow));

src/main/java/com/spring/ifs/bean/BaseSearchBeanTest.java

@@ -188,7 +188,7 @@ public class BaseSearchBeanTest {
         InventoryValue resultRow = BaseSearchApiTest.getInventoryValueByPartNo(srv, site, partNo);
         //判断null
         if(resultRow == null) {
-            throw new APException("库存机按成本不存在!");
+            throw new APException("库存件按成本不存在!");
         }
         logger.info("返回集合大小:"+resultRow.toString());
         return resultRow;

src/main/java/com/spring/modules/Tooling/dao/ToolDao.java

@@ -21,7 +21,7 @@ public interface ToolDao {
     * @date 2024/8/27 17:06
     * @version 1.0
     */
-    List<ToolInfo> getToolInfoList(String site, String toolId, String toolType, int pageIndex, int pageSize);
+    List<ToolInfo> getToolInfoList(String site, String toolId, String toolType, String calendarId, int pageIndex, int pageSize);
 
     /**
     * @description: 统计工具的信息

src/main/java/com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java

@@ -30,7 +30,7 @@ public class ToolDaoImpl implements ToolDao {
     private NamedParameterJdbcTemplate parameterJdbcTemplate;
 
     @Override
-    public List<ToolInfo> getToolInfoList(String site, String toolId, String toolType, int pageIndex, int pageSize) {
+    public List<ToolInfo> getToolInfoList(String site, String toolId, String toolType, String calendarId, int pageIndex, int pageSize) {
         StringBuilder sql = new StringBuilder();
         Map<String, Object> paramMap = new HashMap<String, Object>();
         sql.append("SELECT site, tool_id, tool_description toolDesc, c_tool_type toolType, c_calendar_id calendarId, c_sched_capacity schedCapacity,");
@@ -52,6 +52,10 @@ public class ToolDaoImpl implements ToolDao {
             sql.append(" AND th.c_tool_type = :toolType");
             paramMap.put("toolType", toolType);
         }
+        if(!(null == calendarId || "".equals(calendarId))){
+            sql.append(" AND th.c_calendar_id = :calendarId");
+            paramMap.put("calendarId", calendarId);
+        }
         //排序
         sql.append(" ORDER BY th.tool_id ASC");
         //添加分页

src/main/java/com/spring/modules/Tooling/service/impl/BaseConfigServiceImpl.java

@@ -22,6 +22,10 @@ public class BaseConfigServiceImpl implements BaseConfigService {
     public BaseConfigData getBaseConfigBySiteAndType(BaseConfigData inData) {
         //公共参数
         String site = inData.getSite();
+        //判断是否存在site
+        if(site == null || "".equals(site)){
+            throw new RuntimeException("site不能为空!");
+        }
         String firstType = inData.getFirstType();
         String secondType = inData.getSecondType();
         //判断能否查询到当前配置数据

src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java

@@ -70,12 +70,13 @@ public class ToolServiceImpl implements ToolService {
         String site = inData.getSite();
         String toolId = inData.getToolId();
         String toolType = inData.getToolType();
+        String calendarId = inData.getCalendarId();
         boolean exportFlag = inData.isExportFlag();
         //是否查询
         if(searchFlag) {
             return new ArrayList<>();
         }
-        return toolDao.getToolInfoList(site, toolId, toolType, pageIndex, pageSize);
+        return toolDao.getToolInfoList(site, toolId, toolType, calendarId, pageIndex, pageSize);
     }
 
     @Override

src/main/resources/application-dev.yml

@@ -7,7 +7,8 @@ spring:
 #      url: jdbc:sqlserver://10.10.8.200:1433;databaseName=SRQ_MES_PROD
 #      username: sa
 #      password: SRQmes123@
-      url: jdbc:sqlserver://192.168.1.90:1433;databaseName=ccl_plm
+      url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=ccl_plm
+      #url: jdbc:sqlserver://192.168.1.90:1433;databaseName=ccl_plm
       username: sa
       password: XJsoft123
       initial-size: 10
@@ -63,7 +64,7 @@ ifs-api:
 # ifs接口控制
 ifs-control:
   # (false 禁止调用；true 开启调用)
-  control-flag: true
+  control-flag: false
   # ifs 账号密码 (同步数据使用)
   ifs-username: 'Mingo_zhang'
   ifs-password: 'Ccldesign1'