Browse Source

工具/库位 2022年12月20日 sxm

master
[li_she] 4 years ago
parent
commit
864dd78eef
  1. 9
      src/main/java/com/gaotao/modules/toolman/dao/ToolDetailMapper.java
  2. 16
      src/main/java/com/gaotao/modules/toolman/dao/ToolTransDetailMapper.java
  3. 20
      src/main/java/com/gaotao/modules/toolman/service/impl/LocationServiceImpl.java
  4. 5
      src/main/resources/mapper/toolman/ToolDetailMapper.xml
  5. 9
      src/main/resources/mapper/toolman/ToolTransDetailMapper.xml

9
src/main/java/com/gaotao/modules/toolman/dao/ToolDetailMapper.java

@ -3,6 +3,7 @@ package com.gaotao.modules.toolman.dao;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gaotao.modules.toolman.entity.ToolDetail; import com.gaotao.modules.toolman.entity.ToolDetail;
import com.gaotao.modules.toolman.query.LocationQuery;
import com.gaotao.modules.toolman.query.ToolDetailQuery; import com.gaotao.modules.toolman.query.ToolDetailQuery;
import com.gaotao.modules.toolman.query.ToolTransDetailQuery; import com.gaotao.modules.toolman.query.ToolTransDetailQuery;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@ -152,4 +153,12 @@ public interface ToolDetailMapper {
*/ */
void updateToolDetailInfo(ToolDetailQuery toolDetailQuery); void updateToolDetailInfo(ToolDetailQuery toolDetailQuery);
/**
* @author: sxm
* @description: 获取工具库位信息
* @param [locationQuery]
* @return: int
* @date: 2022/12/20 14:09
*/
int getLocationCount(LocationQuery locationQuery);
} }

16
src/main/java/com/gaotao/modules/toolman/dao/ToolTransDetailMapper.java

@ -1,12 +1,13 @@
package com.gaotao.modules.toolman.dao; package com.gaotao.modules.toolman.dao;
import com.gaotao.modules.toolman.entity.ToolTransDetail; import com.gaotao.modules.toolman.entity.ToolTransDetail;
import java.util.List;
import com.gaotao.modules.toolman.query.LocationQuery;
import com.gaotao.modules.toolman.query.ToolTransDetailQuery; import com.gaotao.modules.toolman.query.ToolTransDetailQuery;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* @Auther: Zuowenwen * @Auther: Zuowenwen
* @Date:2021/07/08 9:40 * @Date:2021/07/08 9:40
@ -86,4 +87,15 @@ public interface ToolTransDetailMapper {
* @date 2021/8/10 * @date 2021/8/10
*/ */
List<ToolTransDetail> getToolInstanceIdUseHist(ToolTransDetailQuery toolTransDetailQuery); List<ToolTransDetail> getToolInstanceIdUseHist(ToolTransDetailQuery toolTransDetailQuery);
/**
* @author: sxm
* @description: 获取 库位交易信息
* @param [locationQuery]
* @return: int
* @date: 2022/12/20 14:16
*/
int getLocationCount(LocationQuery locationQuery);
} }

20
src/main/java/com/gaotao/modules/toolman/service/impl/LocationServiceImpl.java

@ -3,18 +3,18 @@ package com.gaotao.modules.toolman.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gaotao.common.exception.XJException;
import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.PageUtils;
import com.gaotao.common.utils.R; import com.gaotao.common.utils.R;
import com.gaotao.modules.toolman.dao.LocationMapper; import com.gaotao.modules.toolman.dao.LocationMapper;
import com.gaotao.modules.toolman.dao.ToolDetailMapper;
import com.gaotao.modules.toolman.dao.ToolTransDetailMapper;
import com.gaotao.modules.toolman.entity.Location; import com.gaotao.modules.toolman.entity.Location;
import com.gaotao.modules.toolman.query.LocationQuery; import com.gaotao.modules.toolman.query.LocationQuery;
import com.gaotao.modules.toolman.service.LocationService; import com.gaotao.modules.toolman.service.LocationService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/** /**
* @Auther: Zuowenwen * @Auther: Zuowenwen
* @Date:2021/07/07 10:39 * @Date:2021/07/07 10:39
@ -26,6 +26,12 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
@Autowired @Autowired
private LocationMapper locationMapper; private LocationMapper locationMapper;
@Autowired
private ToolDetailMapper toolDetailMapper;
@Autowired
private ToolTransDetailMapper transDetailDao;
@Override @Override
public PageUtils getLocationList(LocationQuery locationQuery) { public PageUtils getLocationList(LocationQuery locationQuery) {
@ -55,9 +61,15 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
return R.ok("操作成功!"); return R.ok("操作成功!");
} }
@Override @Override
public void delLocation(LocationQuery locationQuery) { public void delLocation(LocationQuery locationQuery) {
// 工具使用库位数量
int toolCount = toolDetailMapper.getLocationCount(locationQuery);
int transCount = transDetailDao.getLocationCount(locationQuery);
if (toolCount > 0 || transCount > 0) {
throw new XJException("该库位,还存在工具不能删除");
}
locationMapper.deleteLocation(locationQuery); locationMapper.deleteLocation(locationQuery);
} }

5
src/main/resources/mapper/toolman/ToolDetailMapper.xml

@ -427,5 +427,10 @@
ORDER BY td.id DESC ORDER BY td.id DESC
</select> </select>
<select id="getLocationCount" resultType="java.lang.Integer">
select count(1)
from ToolDetail
where LocationID = #{locationId}
</select>
</mapper> </mapper>

9
src/main/resources/mapper/toolman/ToolTransDetailMapper.xml

@ -228,7 +228,9 @@
</where> </where>
</select> </select>
<select id="getToolInstanceIdUseHist" resultMap="BaseResultMap"> <select id="getToolInstanceIdUseHist" resultMap="BaseResultMap">
select C.SupplierName as supplier_name ,A.created_date as deliveryDate,B.created_date as returnDate
select C.SupplierName as supplier_name
, A.created_date as deliveryDate
, B.created_date as returnDate
, CONVERT(varchar(100), A.created_date, 23) as strDeliveryDate , CONVERT(varchar(100), A.created_date, 23) as strDeliveryDate
, CONVERT(varchar(100), B.created_date, 23) as strReturnDate , CONVERT(varchar(100), B.created_date, 23) as strReturnDate
, B.created_by , B.created_by
@ -238,4 +240,9 @@
LEFT JOIN Supplier C on C.supplierID = A.supplier_id LEFT JOIN Supplier C on C.supplierID = A.supplier_id
where B.orderRef2 = A.trans_no where B.orderRef2 = A.trans_no
</select> </select>
<select id="getLocationCount" resultType="java.lang.Integer">
select count(1)
from tool_trans_detail
where location_id = #{locationId}
</select>
</mapper> </mapper>
Loading…
Cancel
Save