中央刀库基础数据

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/centralToolMagazine/service/impl/ToolStorgeServiceImpl.java

@@ -148,9 +148,10 @@ public class ToolStorgeServiceImpl extends SuperCacheServiceImpl<ToolStorgeMappe
 
     @Override
     public boolean check(ToolStorgeSaveDTO model) {
-        if( (model.getName()!=null && super.count(Wraps.<ToolStorge>lbQ().eq(ToolStorge::getName, model.getName())) > 0)
-                || (model.getNo()!=null && super.count(Wraps.<ToolStorge>lbQ().eq(ToolStorge::getNo, model.getNo())) > 0)
-                || (StringUtil.isNotEmpty(model.getToolNo()) &&super.count(Wraps.<ToolStorge>lbQ().eq(ToolStorge::getToolNo, model.getToolNo())) > 0)){
+        if( (model.getName()!=null && super.count(Wraps.<ToolStorge>lbQ().eq(ToolStorge::getName, model.getName()).eq(ToolStorge::getToolManagementId, model.getToolManagementId())) > 0)
+                || (model.getNo()!=null && super.count(Wraps.<ToolStorge>lbQ().eq(ToolStorge::getNo, model.getNo()).eq(ToolStorge::getToolManagementId, model.getToolManagementId())) > 0)
+               // || (StringUtil.isNotEmpty(model.getToolNo()) &&super.count(Wraps.<ToolStorge>lbQ().eq(ToolStorge::getToolNo, model.getToolNo())) > 0)
+        ){
             return true;
         }
         return false;

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/edgeLibrary/StockInfoMapper.xml

@@ -306,15 +306,16 @@
     </select>
 
     <select id="getToolStorgeCount" resultType="Map">
-        select count(*) as num,tool_management_id as toolManagementId from imcs_tool_storge group by tool_management_id
+
+        select count(*) as num,ts.tool_management_id as toolManagementId from imcs_tool_storge ts INNER JOIN imcs_tool_management tm on ts.tool_management_id=tm.id group by ts.tool_management_id
     </select>
     <select id="getInToolStorgeCount" resultType="Map">
-        select count(*) as num,tool_management_id as toolManagementId from imcs_tool_storge where ifnull(tool_id,-1)!=-1 group by tool_management_id
+        select count(*) as num,tool_management_id as toolManagementId from imcs_tool_storge INNER JOIN imcs_tool_management tm on tool_management_id=tm.id where ifnull(tool_id,-1)!=-1 group by tool_management_id
     </select>
     <select id="getFreeToolStorgeCount" resultType="Map">
-        select count(*)  as num,tool_management_id as toolManagementId from imcs_tool_storge where ifnull(tool_id,-1)=-1 group by tool_management_id
+        select count(*)  as num,tool_management_id as toolManagementId from imcs_tool_storge INNER JOIN imcs_tool_management tm on tool_management_id=tm.id  where ifnull(tool_id,-1)=-1 group by tool_management_id
     </select>
     <select id="getLockToolStorgeCount" resultType="Map">
-        select count(*)  as num,tool_management_id as toolManagementId from imcs_tool_storge where lock_status='0' group by tool_management_id
+        select count(*)  as num,tool_management_id as toolManagementId from imcs_tool_storge INNER JOIN imcs_tool_management tm on tool_management_id=tm.id  where lock_status='0' group by tool_management_id
     </select>
 </mapper>