hanst
/
wms-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

不需要传site来校验controllerid

master
常熟吴彦祖 3 weeks ago
parent
5c08299440
commit
2555a29c61
3 changed files with 32 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      src/main/java/com/gaotao/modules/warehouse/mapper/WmsAvailabilityControlIdMapper.java
  2. 39
      src/main/java/com/gaotao/modules/warehouse/service/impl/WmsAvailabilityControlIdServiceImpl.java
  3. 7
      src/main/resources/mapper/warehouse/WmsAvailabilityControlIdMapper.xml

22
src/main/java/com/gaotao/modules/warehouse/mapper/WmsAvailabilityControlIdMapper.java
View File

@ -10,44 +10,44 @@ import java.util.List;
/**
* 可用性控制ID Mapper接口 - rqrq
*
*
* @author rqrq
* @date 2025/12/02
*/
@Mapper
public interface WmsAvailabilityControlIdMapper extends BaseMapper<WmsAvailabilityControlId> {
/**
* 查询可用性控制ID列表（不分页）- rqrq
*
*
* @param data 查询条件
* @return 列表数据
*/
List<WmsAvailabilityControlId> queryList(WmsAvailabilityControlIdData data);
/**
* 查询启用的可用性控制ID列表（用于下拉选择）- rqrq
*
*
* @return 启用的列表数据
*/
List<WmsAvailabilityControlId> queryActiveList();
/**
* 根据可用性控制ID查询描述（仅查询active='Y'的记录）- rqrq
*
*
* @param availabilityControlId 可用性控制ID
* @return 描述信息，不存在返回null
*/
String getDescByAvailabilityControlId(@Param("availabilityControlId") String availabilityControlId);
/**
* 检查可用性控制ID是否已存在 - rqrq
*
*
* @param availabilityControlId 可用性控制ID
* @param excludeId 排除的ID（用于编辑时排除自身）
* @return 存在返回1，不存在返回0或null
*/
Integer checkAvailabilityControlIdExists(@Param("availabilityControlId") String availabilityControlId,
Integer checkAvailabilityControlIdExists(@Param("availabilityControlId") String availabilityControlId,
@Param("excludeId") Long excludeId);
/**
@ -58,6 +58,6 @@ public interface WmsAvailabilityControlIdMapper extends BaseMapper<WmsAvailabili
* @author rqrq
* @date 2026/06/24
*/
WmsAvailabilityControlId getControlConfigByUnit(@Param("site") String site, @Param("unitId") String unitId);
WmsAvailabilityControlId getControlConfigByUnit( @Param("unitId") String unitId);
}

39
src/main/java/com/gaotao/modules/warehouse/service/impl/WmsAvailabilityControlIdServiceImpl.java
View File

@ -16,17 +16,17 @@ import java.util.List;
/**
* 可用性控制ID Service实现类 - rqrq
*
*
* @author rqrq
* @date 2025/12/02
*/
@Service
public class WmsAvailabilityControlIdServiceImpl extends ServiceImpl<WmsAvailabilityControlIdMapper, WmsAvailabilityControlId>
public class WmsAvailabilityControlIdServiceImpl extends ServiceImpl<WmsAvailabilityControlIdMapper, WmsAvailabilityControlId>
implements WmsAvailabilityControlIdService {
@Autowired
private WmsAvailabilityControlIdMapper wmsAvailabilityControlIdMapper;
/**
* 查询可用性控制ID列表（不分页）- rqrq
*/
@ -37,7 +37,7 @@ public class WmsAvailabilityControlIdServiceImpl extends ServiceImpl<WmsAvailabi
System.out.println("=== WmsAvailabilityControlIdService.queryList 结束，返回" + result.size() + "条记录 - rqrq ===");
return result;
}
/**
* 查询启用的可用性控制ID列表 - rqrq
*/
@ -48,7 +48,7 @@ public class WmsAvailabilityControlIdServiceImpl extends ServiceImpl<WmsAvailabi
System.out.println("=== WmsAvailabilityControlIdService.queryActiveList 结束，返回" + result.size() + "条记录 - rqrq ===");
return result;
}
/**
* 根据可用性控制ID查询描述 - rqrq
*/
@ -60,19 +60,19 @@ public class WmsAvailabilityControlIdServiceImpl extends ServiceImpl<WmsAvailabi
System.out.println("=== WmsAvailabilityControlIdService.getDescByAvailabilityControlId 结束，返回=" + result + " - rqrq ===");
return result;
}
/**
* 保存可用性控制ID - rqrq
*/
@Override
public void saveAvailabilityControlId(WmsAvailabilityControlId entity, String username) {
System.out.println("=== WmsAvailabilityControlIdService.saveAvailabilityControlId 开始 - rqrq ===");
// 校验必填字段 - rqrq
if (!StringUtils.hasText(entity.getAvailabilityControlId())) {
throw new XJException("可用性控制ID不能为空");
}
// 检查ID是否已存在 - rqrq
Integer exists = wmsAvailabilityControlIdMapper.checkAvailabilityControlIdExists(
entity.getAvailabilityControlId(), null);
@ -83,7 +83,7 @@ public class WmsAvailabilityControlIdServiceImpl extends ServiceImpl<WmsAvailabi
// 填充默认控制值并校验 - rqrq
fillDefaultOperationControls(entity);
validateOperationControls(entity);
// 设置默认值 - rqrq
if (!StringUtils.hasText(entity.getActive())) {
entity.setActive("Y");
@ -92,18 +92,18 @@ public class WmsAvailabilityControlIdServiceImpl extends ServiceImpl<WmsAvailabi
entity.setCreatedTime(new Date());
entity.setUpdatedBy(username);
entity.setUpdatedTime(new Date());
wmsAvailabilityControlIdMapper.insert(entity);
System.out.println("=== WmsAvailabilityControlIdService.saveAvailabilityControlId 结束 - rqrq ===");
}
/**
* 更新可用性控制ID - rqrq
*/
@Override
public void updateAvailabilityControlId(WmsAvailabilityControlId entity, String username) {
System.out.println("=== WmsAvailabilityControlIdService.updateAvailabilityControlId 开始 - rqrq ===");
// 校验必填字段 - rqrq
if (entity.getId() == null) {
throw new XJException("ID不能为空");
@ -111,7 +111,7 @@ public class WmsAvailabilityControlIdServiceImpl extends ServiceImpl<WmsAvailabi
if (!StringUtils.hasText(entity.getAvailabilityControlId())) {
throw new XJException("可用性控制ID不能为空");
}
// 检查ID是否已存在（排除自身）- rqrq
Integer exists = wmsAvailabilityControlIdMapper.checkAvailabilityControlIdExists(
entity.getAvailabilityControlId(), entity.getId());
@ -122,14 +122,14 @@ public class WmsAvailabilityControlIdServiceImpl extends ServiceImpl<WmsAvailabi
// 填充默认控制值并校验 - rqrq
fillDefaultOperationControls(entity);
validateOperationControls(entity);
entity.setUpdatedBy(username);
entity.setUpdatedTime(new Date());
wmsAvailabilityControlIdMapper.updateById(entity);
System.out.println("=== WmsAvailabilityControlIdService.updateAvailabilityControlId 结束 - rqrq ===");
}
/**
* 删除可用性控制ID - rqrq
*/
@ -151,9 +151,6 @@ public class WmsAvailabilityControlIdServiceImpl extends ServiceImpl<WmsAvailabi
*/
@Override
public boolean checkPartOperationAllowed(String site, String unitId, String type) {
if (!StringUtils.hasText(site)) {
throw new XJException("site不能为空");
}
if (!StringUtils.hasText(unitId)) {
throw new XJException("unitId不能为空");
}
@ -166,7 +163,7 @@ public class WmsAvailabilityControlIdServiceImpl extends ServiceImpl<WmsAvailabi
throw new XJException("不支持的type：" + type);
}
WmsAvailabilityControlId config = wmsAvailabilityControlIdMapper.getControlConfigByUnit(site, unitId);
WmsAvailabilityControlId config = wmsAvailabilityControlIdMapper.getControlConfigByUnit( unitId);
if (config == null || !StringUtils.hasText(config.getHandlingUnitUnitId())) {
throw new XJException("未找到标签，site=" + site + "，unitId=" + unitId);
}

7
src/main/resources/mapper/warehouse/WmsAvailabilityControlIdMapper.xml
View File

@ -4,7 +4,7 @@
<!-- rqrq - 查询可用性控制ID列表（不分页） -->
<select id="queryList" resultType="WmsAvailabilityControlId">
SELECT
SELECT
id,
availability_control_id,
availability_control_desc,
@ -36,7 +36,7 @@
<!-- rqrq - 查询启用的可用性控制ID列表 -->
<select id="queryActiveList" resultType="WmsAvailabilityControlId">
SELECT
SELECT
id,
availability_control_id,
availability_control_desc,
@ -96,8 +96,7 @@
FROM handling_unit hu WITH (NOLOCK)
LEFT JOIN wms_availability_control_id ac WITH (NOLOCK)
ON hu.availability_control_id = ac.availability_control_id
WHERE hu.site = #{site}
AND hu.unit_id = #{unitId}
WHERE hu.unit_id = #{unitId}
</select>
</mapper>

Write Preview
Loading…
Cancel
Save