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

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

master
[li_she] 4 years ago
parent
e852c0aee6
commit
864dd78eef
5 changed files with 100 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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. 32
      src/main/java/com/gaotao/modules/toolman/service/impl/LocationServiceImpl.java
  4. 5
      src/main/resources/mapper/toolman/ToolDetailMapper.xml
  5. 93
      src/main/resources/mapper/toolman/ToolTransDetailMapper.xml

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

@ -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
View File

@ -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);
} }

32
src/main/java/com/gaotao/modules/toolman/service/impl/LocationServiceImpl.java
View File

@ -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,10 +26,16 @@ 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) {
IPage<Location> sysLanguagePackVoIPage = locationMapper.getLocationList(new Page<Location>(locationQuery.getPage(), locationQuery.getLimit()),locationQuery);
IPage<Location> sysLanguagePackVoIPage = locationMapper.getLocationList(new Page<Location>(locationQuery.getPage(), locationQuery.getLimit()), locationQuery);
return new PageUtils(sysLanguagePackVoIPage); return new PageUtils(sysLanguagePackVoIPage);
} }
@ -42,22 +48,28 @@ public class LocationServiceImpl extends ServiceImpl<LocationMapper, Location> i
@Override @Override
public R saveLocation(LocationQuery locationQuery) { public R saveLocation(LocationQuery locationQuery) {
if(locationQuery.getId() > 0){
if (locationQuery.getId() > 0) {
locationMapper.updateLocation(locationQuery); locationMapper.updateLocation(locationQuery);
}else {
} else {
int count = locationMapper.getLoctionCount(locationQuery); int count = locationMapper.getLoctionCount(locationQuery);
if(count == 0){
if (count == 0) {
locationMapper.insertSelective(locationQuery); locationMapper.insertSelective(locationQuery);
}else {
return R.error(1 ,"库位编码已存在！");
} else {
return R.error(1, "库位编码已存在！");
} }
} }
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
View File

@ -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>

93
src/main/resources/mapper/toolman/ToolTransDetailMapper.xml
View File

@ -1,38 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gaotao.modules.toolman.dao.ToolTransDetailMapper"> <mapper namespace="com.gaotao.modules.toolman.dao.ToolTransDetailMapper">
<resultMap id="BaseResultMap" type="com.gaotao.modules.toolman.entity.ToolTransDetail">
<!--@mbg.generated-->
<!--@Table tool_trans_detail-->
<result column="id" jdbcType="INTEGER" property="id" />
<result column="trans_no" jdbcType="VARCHAR" property="transNo" />
<result column="item_no" jdbcType="VARCHAR" property="itemNo" />
<result column="tool_instance_id" jdbcType="VARCHAR" property="toolInstanceId" />
<result column="trans_qty" jdbcType="INTEGER" property="transQty" />
<result column="batch_no" jdbcType="VARCHAR" property="batchNo" />
<result column="ware_house_id" jdbcType="VARCHAR" property="wareHouseId" />
<result column="location_id" jdbcType="VARCHAR" property="locationId" />
<result column="direction" jdbcType="CHAR" property="direction" />
<result column="orderRef1" jdbcType="VARCHAR" property="orderRef1" />
<result column="orderRef2" jdbcType="VARCHAR" property="orderRef2" />
<result column="orderRef3" jdbcType="VARCHAR" property="orderRef3" />
<result column="orderRef4" jdbcType="VARCHAR" property="orderRef4" />
<result column="supplier_id" jdbcType="VARCHAR" property="supplierId" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="created_by" jdbcType="VARCHAR" property="createdBy" />
<result column="created_date" jdbcType="TIMESTAMP" property="createdDate" />
<result column="update_by" jdbcType="VARCHAR" property="updateBy" />
<result column="updated_date" jdbcType="TIMESTAMP" property="updatedDate" />
<result column="delflag" jdbcType="CHAR" property="delflag" />
<result column="version" jdbcType="INTEGER" property="version" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, trans_no, item_no, tool_instance_id, trans_qty, batch_no, ware_house_id, location_id,
direction, orderRef1, orderRef2, orderRef3, orderRef4, supplier_id, remark, created_by,
created_date, update_by, updated_date, delflag, version
</sql>
<insert id="insertSelective">
<resultMap id="BaseResultMap" type="com.gaotao.modules.toolman.entity.ToolTransDetail">
<!--@mbg.generated-->
<!--@Table tool_trans_detail-->
<result column="id" jdbcType="INTEGER" property="id"/>
<result column="trans_no" jdbcType="VARCHAR" property="transNo"/>
<result column="item_no" jdbcType="VARCHAR" property="itemNo"/>
<result column="tool_instance_id" jdbcType="VARCHAR" property="toolInstanceId"/>
<result column="trans_qty" jdbcType="INTEGER" property="transQty"/>
<result column="batch_no" jdbcType="VARCHAR" property="batchNo"/>
<result column="ware_house_id" jdbcType="VARCHAR" property="wareHouseId"/>
<result column="location_id" jdbcType="VARCHAR" property="locationId"/>
<result column="direction" jdbcType="CHAR" property="direction"/>
<result column="orderRef1" jdbcType="VARCHAR" property="orderRef1"/>
<result column="orderRef2" jdbcType="VARCHAR" property="orderRef2"/>
<result column="orderRef3" jdbcType="VARCHAR" property="orderRef3"/>
<result column="orderRef4" jdbcType="VARCHAR" property="orderRef4"/>
<result column="supplier_id" jdbcType="VARCHAR" property="supplierId"/>
<result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="created_by" jdbcType="VARCHAR" property="createdBy"/>
<result column="created_date" jdbcType="TIMESTAMP" property="createdDate"/>
<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
<result column="updated_date" jdbcType="TIMESTAMP" property="updatedDate"/>
<result column="delflag" jdbcType="CHAR" property="delflag"/>
<result column="version" jdbcType="INTEGER" property="version"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, trans_no, item_no, tool_instance_id, trans_qty, batch_no, ware_house_id, location_id,
direction, orderRef1, orderRef2, orderRef3, orderRef4, supplier_id, remark, created_by,
created_date, update_by, updated_date, delflag, version
</sql>
<insert id="insertSelective">
<!--@mbg.generated--> <!--@mbg.generated-->
INSERT INTO tool_trans_detail INSERT INTO tool_trans_detail
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
@ -85,7 +85,7 @@
<if test="transPrice!=null">#{transPrice}</if> <if test="transPrice!=null">#{transPrice}</if>
</trim> </trim>
</insert> </insert>
<insert id="insertList">
<insert id="insertList">
<!--@mbg.generated--> <!--@mbg.generated-->
INSERT INTO tool_trans_detail( INSERT INTO tool_trans_detail(
id, id,
@ -136,7 +136,7 @@
) )
</foreach> </foreach>
</insert> </insert>
<update id="updateById">
<update id="updateById">
<!--@mbg.generated--> <!--@mbg.generated-->
update tool_trans_detail update tool_trans_detail
<set> <set>
@ -207,7 +207,7 @@
</if> </if>
</where> </where>
</update> </update>
<delete id="deleteById">
<delete id="deleteById">
<!--@mbg.generated--> <!--@mbg.generated-->
delete from tool_trans_detail delete from tool_trans_detail
<where> <where>
@ -216,7 +216,7 @@
</if> </if>
</where> </where>
</delete> </delete>
<select id="selectByTransNo" resultMap="BaseResultMap">
<select id="selectByTransNo" resultMap="BaseResultMap">
<!--@mbg.generated--> <!--@mbg.generated-->
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
@ -228,14 +228,21 @@
</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
,CONVERT(varchar(100), A.created_date, 23) as strDeliveryDate
,CONVERT(varchar(100), B.created_date, 23) as strReturnDate
,B.created_by
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), B.created_date, 23) as strReturnDate
, B.created_by
from tool_trans_detail B from tool_trans_detail B
left join tool_trans_detail A on A.tool_instance_id = B.tool_instance_id and A.trans_no like 'TW%'
left join tool_trans_detail A on A.tool_instance_id = B.tool_instance_id and A.trans_no like 'TW%'
and A.tool_instance_id = #{toolInstanceId,jdbcType=VARCHAR} and A.tool_instance_id = #{toolInstanceId,jdbcType=VARCHAR}
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>
Write Preview
Loading…
Cancel
Save