AlanScipio
2 years ago
parent
2366176f01
commit
603803f5e7
@ -1,105 +1,108 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<!DOCTYPE mapper
|
<!DOCTYPE mapper
|
||||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||||
<mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
|
<mapper namespace="com.ruoyi.system.mapper.SysDictTypeMapper">
|
||||||
|
|
||||||
<resultMap type="SysDictType" id="SysDictTypeResult">
|
<resultMap type="com.ruoyi.system.api.domain.SysDictType" id="SysDictTypeResult">
|
||||||
<id property="dictId" column="dict_id" />
|
<id property="dictId" column="dict_id"/>
|
||||||
<result property="dictName" column="dict_name" />
|
<result property="dictName" column="dict_name"/>
|
||||||
<result property="dictType" column="dict_type" />
|
<result property="dictType" column="dict_type"/>
|
||||||
<result property="status" column="status" />
|
<result property="status" column="status"/>
|
||||||
<result property="createBy" column="create_by" />
|
<result property="createBy" column="create_by"/>
|
||||||
<result property="createTime" column="create_time" />
|
<result property="createTime" column="create_time"/>
|
||||||
<result property="updateBy" column="update_by" />
|
<result property="updateBy" column="update_by"/>
|
||||||
<result property="updateTime" column="update_time" />
|
<result property="updateTime" column="update_time"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<sql id="selectDictTypeVo">
|
<sql id="selectDictTypeVo">
|
||||||
select dict_id, dict_name, dict_type, status, create_by, create_time, remark
|
select dict_id, dict_name, dict_type, status, create_by, create_time, remark
|
||||||
from sys_dict_type
|
from sys_dict_type
|
||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectDictTypeList" parameterType="SysDictType" resultMap="SysDictTypeResult">
|
<select id="selectDictTypeList" parameterType="com.ruoyi.system.api.domain.SysDictType"
|
||||||
<include refid="selectDictTypeVo"/>
|
resultMap="SysDictTypeResult">
|
||||||
<where>
|
<include refid="selectDictTypeVo"/>
|
||||||
<if test="dictName != null and dictName != ''">
|
<where>
|
||||||
AND dict_name like concat('%', #{dictName}, '%')
|
<if test="dictName != null and dictName != ''">
|
||||||
</if>
|
AND dict_name like concat('%', #{dictName}, '%')
|
||||||
<if test="status != null and status != ''">
|
</if>
|
||||||
AND status = #{status}
|
<if test="status != null and status != ''">
|
||||||
</if>
|
AND status = #{status}
|
||||||
<if test="dictType != null and dictType != ''">
|
</if>
|
||||||
AND dict_type like concat('%', #{dictType}, '%')
|
<if test="dictType != null and dictType != ''">
|
||||||
</if>
|
AND dict_type like concat('%', #{dictType}, '%')
|
||||||
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
</if>
|
||||||
and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
|
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
||||||
</if>
|
and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
|
||||||
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
</if>
|
||||||
and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
|
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
||||||
</if>
|
and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
|
||||||
</where>
|
</if>
|
||||||
</select>
|
</where>
|
||||||
|
</select>
|
||||||
|
|
||||||
<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
|
<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
|
||||||
<include refid="selectDictTypeVo"/>
|
<include refid="selectDictTypeVo"/>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
|
<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">
|
||||||
<include refid="selectDictTypeVo"/>
|
<include refid="selectDictTypeVo"/>
|
||||||
where dict_id = #{dictId}
|
where dict_id = #{dictId}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
|
<select id="selectDictTypeByType" parameterType="String" resultMap="SysDictTypeResult">
|
||||||
<include refid="selectDictTypeVo"/>
|
<include refid="selectDictTypeVo"/>
|
||||||
where dict_type = #{dictType}
|
where dict_type = #{dictType}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
|
<select id="checkDictTypeUnique" parameterType="String" resultMap="SysDictTypeResult">
|
||||||
<include refid="selectDictTypeVo"/>
|
<include refid="selectDictTypeVo"/>
|
||||||
where dict_type = #{dictType} limit 1
|
where dict_type = #{dictType} limit 1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<delete id="deleteDictTypeById" parameterType="Long">
|
<delete id="deleteDictTypeById" parameterType="Long">
|
||||||
delete from sys_dict_type where dict_id = #{dictId}
|
delete
|
||||||
</delete>
|
from sys_dict_type
|
||||||
|
where dict_id = #{dictId}
|
||||||
|
</delete>
|
||||||
|
|
||||||
<delete id="deleteDictTypeByIds" parameterType="Long">
|
<delete id="deleteDictTypeByIds" parameterType="Long">
|
||||||
delete from sys_dict_type where dict_id in
|
delete from sys_dict_type where dict_id in
|
||||||
<foreach collection="array" item="dictId" open="(" separator="," close=")">
|
<foreach collection="array" item="dictId" open="(" separator="," close=")">
|
||||||
#{dictId}
|
#{dictId}
|
||||||
</foreach>
|
</foreach>
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
<update id="updateDictType" parameterType="SysDictType">
|
<update id="updateDictType" parameterType="com.ruoyi.system.api.domain.SysDictTypeSysDictType">
|
||||||
update sys_dict_type
|
update sys_dict_type
|
||||||
<set>
|
<set>
|
||||||
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
|
<if test="dictName != null and dictName != ''">dict_name = #{dictName},</if>
|
||||||
<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
|
<if test="dictType != null and dictType != ''">dict_type = #{dictType},</if>
|
||||||
<if test="status != null">status = #{status},</if>
|
<if test="status != null">status = #{status},</if>
|
||||||
<if test="remark != null">remark = #{remark},</if>
|
<if test="remark != null">remark = #{remark},</if>
|
||||||
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
|
||||||
update_time = sysdate()
|
update_time = sysdate()
|
||||||
</set>
|
</set>
|
||||||
where dict_id = #{dictId}
|
where dict_id = #{dictId}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<insert id="insertDictType" parameterType="SysDictType">
|
<insert id="insertDictType" parameterType="com.ruoyi.system.api.domain.SysDictTypeSysDictType">
|
||||||
insert into sys_dict_type(
|
insert into sys_dict_type(
|
||||||
<if test="dictName != null and dictName != ''">dict_name,</if>
|
<if test="dictName != null and dictName != ''">dict_name,</if>
|
||||||
<if test="dictType != null and dictType != ''">dict_type,</if>
|
<if test="dictType != null and dictType != ''">dict_type,</if>
|
||||||
<if test="status != null">status,</if>
|
<if test="status != null">status,</if>
|
||||||
<if test="remark != null and remark != ''">remark,</if>
|
<if test="remark != null and remark != ''">remark,</if>
|
||||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||||
create_time
|
create_time
|
||||||
)values(
|
)values(
|
||||||
<if test="dictName != null and dictName != ''">#{dictName},</if>
|
<if test="dictName != null and dictName != ''">#{dictName},</if>
|
||||||
<if test="dictType != null and dictType != ''">#{dictType},</if>
|
<if test="dictType != null and dictType != ''">#{dictType},</if>
|
||||||
<if test="status != null">#{status},</if>
|
<if test="status != null">#{status},</if>
|
||||||
<if test="remark != null and remark != ''">#{remark},</if>
|
<if test="remark != null and remark != ''">#{remark},</if>
|
||||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||||
sysdate()
|
sysdate()
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
@ -0,0 +1,75 @@
|
|||||||
|
package com.ruoyi.wms.controller.stock;
|
||||||
|
|
||||||
|
import com.ruoyi.common.core.utils.poi.ExcelUtil;
|
||||||
|
import com.ruoyi.common.core.web.controller.BaseController;
|
||||||
|
import com.ruoyi.common.core.web.domain.AjaxResult;
|
||||||
|
import com.ruoyi.common.core.web.page.TableDataInfo;
|
||||||
|
import com.ruoyi.common.log.annotation.Log;
|
||||||
|
import com.ruoyi.common.log.enums.BusinessType;
|
||||||
|
import com.ruoyi.common.security.annotation.RequiresPermissions;
|
||||||
|
import com.ruoyi.wms.domain.InvTransHis;
|
||||||
|
import com.ruoyi.wms.service.stock.IInvTransHisService;
|
||||||
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 入出库履历Controller
|
||||||
|
*
|
||||||
|
* @author ryas
|
||||||
|
* created on 2024-02-23
|
||||||
|
*/
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/InvTransHis")
|
||||||
|
public class InvTransHisController extends BaseController {
|
||||||
|
@Autowired
|
||||||
|
private IInvTransHisService invTransHisService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询入出库履历列表
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("wms:InvTransHis:list")
|
||||||
|
@GetMapping("/list")
|
||||||
|
public TableDataInfo list(InvTransHis invTransHis) {
|
||||||
|
startPage();
|
||||||
|
List<InvTransHis> list = invTransHisService.selectInvTransHisList(invTransHis);
|
||||||
|
return getDataTable(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 导出入出库履历列表
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("wms:InvTransHis:export")
|
||||||
|
@Log(title = "入出库履历", businessType = BusinessType.EXPORT)
|
||||||
|
@PostMapping("/export")
|
||||||
|
public void export(HttpServletResponse response, InvTransHis invTransHis) {
|
||||||
|
List<InvTransHis> list = invTransHisService.selectInvTransHisList(invTransHis);
|
||||||
|
if (list.isEmpty()) {
|
||||||
|
responseJsonWarn(response, "没有数据可以导出");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ExcelUtil<InvTransHis> util = new ExcelUtil<>(InvTransHis.class);
|
||||||
|
util.exportExcel(response, list, "入出库履历数据");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取入出库履历详细信息
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("wms:InvTransHis:query")
|
||||||
|
@GetMapping(value = "/{invTransNo}")
|
||||||
|
public AjaxResult getInfo(@PathVariable("invTransNo") String invTransNo) {
|
||||||
|
return success(invTransHisService.selectInvTransHisByInvTransNo(invTransNo));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除入出库履历
|
||||||
|
*/
|
||||||
|
@RequiresPermissions("wms:InvTransHis:remove")
|
||||||
|
@Log(title = "入出库履历", businessType = BusinessType.DELETE)
|
||||||
|
@DeleteMapping("/{invTransNos}")
|
||||||
|
public AjaxResult remove(@PathVariable String[] invTransNos) {
|
||||||
|
return toAjax(invTransHisService.deleteInvTransHisByInvTransNos(invTransNos));
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
package com.ruoyi.wms.mapper.stock;
|
||||||
|
|
||||||
|
import com.ruoyi.wms.domain.InvTransHis;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Alan Scipio
|
||||||
|
* created on 2024/2/23
|
||||||
|
*/
|
||||||
|
public interface InvTransHisExtMapper {
|
||||||
|
|
||||||
|
List<InvTransHis> selectPageList(InvTransHis invTransHis);
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,45 @@
|
|||||||
|
package com.ruoyi.wms.service.stock;
|
||||||
|
|
||||||
|
import com.ruoyi.wms.domain.InvTransHis;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 入出库履历Service接口
|
||||||
|
*
|
||||||
|
* @author ryas
|
||||||
|
* created on 2024-02-23
|
||||||
|
*/
|
||||||
|
public interface IInvTransHisService {
|
||||||
|
/**
|
||||||
|
* 查询入出库履历
|
||||||
|
*
|
||||||
|
* @param invTransNo 入出库履历主键
|
||||||
|
* @return 入出库履历
|
||||||
|
*/
|
||||||
|
InvTransHis selectInvTransHisByInvTransNo(String invTransNo);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询入出库履历列表
|
||||||
|
*
|
||||||
|
* @param invTransHis 入出库履历
|
||||||
|
* @return 入出库履历集合
|
||||||
|
*/
|
||||||
|
List<InvTransHis> selectInvTransHisList(InvTransHis invTransHis);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量删除入出库履历
|
||||||
|
*
|
||||||
|
* @param invTransNos 需要删除的入出库履历主键集合
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
int deleteInvTransHisByInvTransNos(String[] invTransNos);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除入出库履历信息
|
||||||
|
*
|
||||||
|
* @param invTransNo 入出库履历主键
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
int deleteInvTransHisByInvTransNo(String invTransNo);
|
||||||
|
}
|
||||||
@ -0,0 +1,92 @@
|
|||||||
|
package com.ruoyi.wms.service.stock;
|
||||||
|
|
||||||
|
import com.ruoyi.common.core.utils.DateUtils;
|
||||||
|
import com.ruoyi.common.core.web.domain.ExtBaseEntity;
|
||||||
|
import com.ruoyi.common.security.utils.SecurityUtilsExt;
|
||||||
|
import com.ruoyi.wms.domain.InvTransHis;
|
||||||
|
import com.ruoyi.wms.mapper.stock.InvTransHisDynamicSqlSupport;
|
||||||
|
import com.ruoyi.wms.mapper.stock.InvTransHisExtMapper;
|
||||||
|
import com.ruoyi.wms.mapper.stock.InvTransHisMapper;
|
||||||
|
import jakarta.annotation.Resource;
|
||||||
|
import org.mybatis.dynamic.sql.SqlBuilder;
|
||||||
|
import org.mybatis.dynamic.sql.render.RenderingStrategies;
|
||||||
|
import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 入出库履历Service业务层处理
|
||||||
|
*
|
||||||
|
* @author ryas
|
||||||
|
* created on 2024-02-23
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
public class InvTransHisServiceImpl implements IInvTransHisService {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private InvTransHisMapper invTransHisMapper;
|
||||||
|
@Resource
|
||||||
|
private InvTransHisExtMapper invTransHisExtMapper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询入出库履历
|
||||||
|
*
|
||||||
|
* @param invTransNo 入出库履历主键
|
||||||
|
* @return 入出库履历
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public InvTransHis selectInvTransHisByInvTransNo(String invTransNo) {
|
||||||
|
Optional<InvTransHis> result = invTransHisMapper.selectOne(dsl -> dsl.where(InvTransHisDynamicSqlSupport.invTransNo, SqlBuilder.isEqualTo(invTransNo)));
|
||||||
|
return result.orElse(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询入出库履历列表
|
||||||
|
*
|
||||||
|
* @param invTransHis 入出库履历
|
||||||
|
* @return 入出库履历
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public List<InvTransHis> selectInvTransHisList(InvTransHis invTransHis) {
|
||||||
|
return invTransHisExtMapper.selectPageList(invTransHis);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量删除入出库履历
|
||||||
|
*
|
||||||
|
* @param invTransNos 需要删除的入出库履历主键
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
@Transactional
|
||||||
|
@Override
|
||||||
|
public int deleteInvTransHisByInvTransNos(String[] invTransNos) {
|
||||||
|
String userId = SecurityUtilsExt.getUserIdStr();
|
||||||
|
UpdateStatementProvider provider = SqlBuilder.update(InvTransHisDynamicSqlSupport.invTransHis)
|
||||||
|
.set(InvTransHisDynamicSqlSupport.deleteFlag).equalTo(ExtBaseEntity.DELETED)
|
||||||
|
.set(InvTransHisDynamicSqlSupport.updateTime).equalTo(DateUtils.getNowDate())
|
||||||
|
.set(InvTransHisDynamicSqlSupport.updateBy).equalTo(userId)
|
||||||
|
.where(InvTransHisDynamicSqlSupport.invTransNo, SqlBuilder.isIn(invTransNos))
|
||||||
|
.build()
|
||||||
|
.render(RenderingStrategies.MYBATIS3);
|
||||||
|
return invTransHisMapper.update(provider);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除入出库履历信息
|
||||||
|
*
|
||||||
|
* @param invTransNo 入出库履历主键
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
@Transactional
|
||||||
|
@Override
|
||||||
|
public int deleteInvTransHisByInvTransNo(String invTransNo) {
|
||||||
|
InvTransHis record = new InvTransHis();
|
||||||
|
record.setInvTransNo(invTransNo);
|
||||||
|
record.setDeleteFlag(ExtBaseEntity.DELETED);
|
||||||
|
record.setUpdateTime(DateUtils.getNowDate());
|
||||||
|
return invTransHisMapper.updateByPrimaryKey(record);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,100 @@
|
|||||||
|
<?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">
|
||||||
|
<mapper namespace="com.ruoyi.wms.mapper.stock.InvTransHisExtMapper">
|
||||||
|
|
||||||
|
<resultMap type="com.ruoyi.wms.domain.InvTransHis" id="InvTransHisResult">
|
||||||
|
<result property="deptId" column="DEPT_ID"/>
|
||||||
|
<result property="invTransNo" column="INV_TRANS_NO"/>
|
||||||
|
<result property="invTransType" column="INV_TRANS_TYPE"/>
|
||||||
|
<result property="whsCd" column="WHS_CD"/>
|
||||||
|
<result property="stgBinCd" column="STG_BIN_CD"/>
|
||||||
|
<result property="palletId" column="PALLET_ID"/>
|
||||||
|
<result property="stdUnitQty" column="STD_UNIT_QTY"/>
|
||||||
|
<result property="pkgUnitQty" column="PKG_UNIT_QTY"/>
|
||||||
|
<result property="transOrderNo" column="TRANS_ORDER_NO"/>
|
||||||
|
<result property="transOrderDetlNo" column="TRANS_ORDER_DETL_NO"/>
|
||||||
|
<result property="operator" column="OPERATOR"/>
|
||||||
|
<result property="businessCls" column="BUSINESS_CLS"/>
|
||||||
|
<result property="itemCd" column="ITEM_CD"/>
|
||||||
|
<result property="lotNo" column="LOT_NO"/>
|
||||||
|
<result property="subLotNo" column="SUB_LOT_NO"/>
|
||||||
|
<result property="serialNo" column="SERIAL_NO"/>
|
||||||
|
<result property="reason" column="REASON"/>
|
||||||
|
<result property="remark1" column="REMARK_1"/>
|
||||||
|
<result property="remark2" column="REMARK_2"/>
|
||||||
|
<result property="remark3" column="REMARK_3"/>
|
||||||
|
<result property="remark4" column="REMARK_4"/>
|
||||||
|
<result property="remark5" column="REMARK_5"/>
|
||||||
|
<result property="updateCount" column="UPDATE_COUNT"/>
|
||||||
|
<result property="deleteFlag" column="DELETE_FLAG"/>
|
||||||
|
<result property="createBy" column="create_by"/>
|
||||||
|
<result property="createTime" column="create_time"/>
|
||||||
|
<result property="updateBy" column="update_by"/>
|
||||||
|
<result property="updateTime" column="update_time"/>
|
||||||
|
<result property="remark" column="remark"/>
|
||||||
|
<result property="createByUser" column="create_by_name"/>
|
||||||
|
<result property="stdUnitCd" column="STD_UNIT_CD"/>
|
||||||
|
<result property="pkgUnitCd" column="PKG_UNIT_CD"/>
|
||||||
|
<result property="stdUnitName" column="STD_UNIT_NAME"/>
|
||||||
|
<result property="pkgUnitName" column="PKG_UNIT_NAME"/>
|
||||||
|
</resultMap>
|
||||||
|
|
||||||
|
<select id="selectPageList" parameterType="com.ruoyi.wms.domain.InvTransHis" resultMap="InvTransHisResult">
|
||||||
|
select
|
||||||
|
t.DEPT_ID,
|
||||||
|
t.INV_TRANS_NO,
|
||||||
|
t.INV_TRANS_TYPE,
|
||||||
|
t.WHS_CD,
|
||||||
|
t.STG_BIN_CD,
|
||||||
|
t.ITEM_CD,
|
||||||
|
t.LOT_NO,
|
||||||
|
t.SUB_LOT_NO,
|
||||||
|
t.STD_UNIT_QTY,
|
||||||
|
t.PKG_UNIT_QTY,
|
||||||
|
t.SERIAL_NO,
|
||||||
|
t.PALLET_ID,
|
||||||
|
t.UPDATE_COUNT,
|
||||||
|
t.DELETE_FLAG,
|
||||||
|
t.OPERATOR,
|
||||||
|
t.BUSINESS_CLS,
|
||||||
|
t.REASON,
|
||||||
|
t.TRANS_ORDER_DETL_NO,
|
||||||
|
t.TRANS_ORDER_NO,
|
||||||
|
t.create_by,
|
||||||
|
t.create_time,
|
||||||
|
t.update_by,
|
||||||
|
t.update_time,
|
||||||
|
whs.WHS_NAME,
|
||||||
|
item.ITEM_NAME,
|
||||||
|
item.STD_UNIT_CD,
|
||||||
|
item.PKG_UNIT_CD,
|
||||||
|
stdUnit.UNIT_NAME as STD_UNIT_NAME,
|
||||||
|
pkgUnit.UNIT_NAME as PKG_UNIT_NAME,
|
||||||
|
userCreate.user_name as create_by_name
|
||||||
|
from WMS_B_INV_TRANS_HIS t
|
||||||
|
left join WMS_M_WAREHOUSE_INFO whs on t.WHS_CD = whs.WHS_CD and whs.DELETE_FLAG = 0
|
||||||
|
left join WMS_M_ITEM_INFO item on t.ITEM_CD = item.ITEM_CD and item.DELETE_FLAG = 0
|
||||||
|
left join WMS_M_UNIT_INFO stdUnit on item.STD_UNIT_CD = stdUnit.UNIT_CODE and stdUnit.DELETE_FLAG = 0
|
||||||
|
left join WMS_M_UNIT_INFO pkgUnit on item.PKG_UNIT_CD = pkgUnit.UNIT_CODE and pkgUnit.DELETE_FLAG = 0
|
||||||
|
left join sys_user userCreate on t.create_by = userCreate.user_id
|
||||||
|
<where>
|
||||||
|
and t.DELETE_FLAG = 0
|
||||||
|
<if test="invTransType != null">
|
||||||
|
and t.INV_TRANS_TYPE = #{invTransType}
|
||||||
|
</if>
|
||||||
|
<if test="whsCd != null and whsCd != ''">
|
||||||
|
and t.WHS_CD = #{whsCd}
|
||||||
|
</if>
|
||||||
|
<if test="stgBinCd != null and stgBinCd != ''">
|
||||||
|
and t.STG_BIN_CD = #{stgBinCd}
|
||||||
|
</if>
|
||||||
|
<if test="itemCd != null and itemCd != ''">
|
||||||
|
and t.ITEM_CD like concat('%', #{itemCd}, '%')
|
||||||
|
</if>
|
||||||
|
<if test="lotNo != null and lotNo != ''">
|
||||||
|
and t.LOT_NO like concat('%', #{lotNo}, '%')
|
||||||
|
</if>
|
||||||
|
</where>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
</mapper>
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
import request from '@/utils/request'
|
||||||
|
|
||||||
|
// 查询入出库履历列表
|
||||||
|
export function listInvTransHis(query) {
|
||||||
|
return request({
|
||||||
|
url: '/wms/InvTransHis/list',
|
||||||
|
method: 'get',
|
||||||
|
params: query
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 查询入出库履历详细
|
||||||
|
export function getInvTransHis(invTransNo) {
|
||||||
|
return request({
|
||||||
|
url: '/wms/InvTransHis/' + invTransNo,
|
||||||
|
method: 'get'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// 删除入出库履历
|
||||||
|
export function delInvTransHis(invTransNo) {
|
||||||
|
return request({
|
||||||
|
url: '/wms/InvTransHis/' + invTransNo,
|
||||||
|
method: 'delete'
|
||||||
|
})
|
||||||
|
}
|
||||||
@ -0,0 +1,234 @@
|
|||||||
|
<template>
|
||||||
|
<div class="app-container">
|
||||||
|
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="85px">
|
||||||
|
<el-form-item label="入出库类型" prop="invTransType">
|
||||||
|
<data-select v-model="queryParams.invTransType" dict-name="wms_inv_trans_type" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="仓库" prop="whsCd">
|
||||||
|
<!-- <el-input-->
|
||||||
|
<!-- v-model="queryParams.whsCd"-->
|
||||||
|
<!-- placeholder="请输入仓库代码"-->
|
||||||
|
<!-- clearable-->
|
||||||
|
<!-- @keyup.enter="handleQuery"-->
|
||||||
|
<!-- />-->
|
||||||
|
<data-select v-model="queryParams.whsCd" :fetch-data="fetchWarehouseData" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="货架号" prop="stgBinCd">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.stgBinCd"
|
||||||
|
placeholder="请输入货架号"
|
||||||
|
clearable
|
||||||
|
@keyup.enter="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="物品代码" prop="itemCd">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.itemCd"
|
||||||
|
placeholder="请输入物品代码"
|
||||||
|
clearable
|
||||||
|
@keyup.enter="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="批号" prop="lotNo">
|
||||||
|
<el-input
|
||||||
|
v-model="queryParams.lotNo"
|
||||||
|
placeholder="请输入批号"
|
||||||
|
clearable
|
||||||
|
@keyup.enter="handleQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<el-row :gutter="10" class="mb8">
|
||||||
|
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||||
|
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button
|
||||||
|
type="warning"
|
||||||
|
plain
|
||||||
|
icon="Download"
|
||||||
|
@click="handleExport"
|
||||||
|
v-hasPermi="['wms:InvTransHis:export']"
|
||||||
|
>导出</el-button>
|
||||||
|
</el-col>
|
||||||
|
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
|
<el-table v-loading="loading" :data="InvTransHisList" @selection-change="handleSelectionChange" :show-overflow-tooltip="true">
|
||||||
|
<el-table-column type="selection" width="30" align="center" />
|
||||||
|
<el-table-column label="入出库履历号" align="center" prop="invTransNo" />
|
||||||
|
<el-table-column label="入出库类型" align="center" prop="invTransType" >
|
||||||
|
<template #default="scope">
|
||||||
|
<dict-tag :options="wms_inv_trans_type" :value="scope.row.invTransType"/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="存储位置" align="center" >
|
||||||
|
<el-table-column label="仓库代码" align="center" prop="whsCd" />
|
||||||
|
<el-table-column label="货架号" align="center" prop="stgBinCd" />
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="物品代码" align="center" prop="itemCd" />
|
||||||
|
<el-table-column label="批号" align="center" prop="lotNo" />
|
||||||
|
<el-table-column label="子批号" align="center" prop="subLotNo" />
|
||||||
|
<el-table-column label="数量" align="center" >
|
||||||
|
<el-table-column label="标准单位数量" align="center" prop="stdUnitQty" />
|
||||||
|
<el-table-column label="标准单位" align="center" prop="stdUnitName" />
|
||||||
|
<el-table-column label="包装单位数量" align="center" prop="pkgUnitQty" />
|
||||||
|
<el-table-column label="包装单位" align="center" prop="pkgUnitName" />
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="创建者" align="center" prop="createByUser" />
|
||||||
|
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
||||||
|
<template #default="scope">
|
||||||
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<pagination
|
||||||
|
v-show="total>0"
|
||||||
|
:total="total"
|
||||||
|
v-model:page="queryParams.pageNum"
|
||||||
|
v-model:limit="queryParams.pageSize"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- 添加或修改入出库履历对话框 -->
|
||||||
|
<!-- <el-dialog :title="title" v-model="open" width="500px" append-to-body>-->
|
||||||
|
<!-- <el-form ref="InvTransHisRef" :model="form" :rules="rules" label-width="80px">-->
|
||||||
|
<!-- </el-form>-->
|
||||||
|
<!-- <template #footer>-->
|
||||||
|
<!-- <div class="dialog-footer">-->
|
||||||
|
<!-- <el-button type="primary" @click="submitForm">确 定</el-button>-->
|
||||||
|
<!-- <el-button @click="cancel">取 消</el-button>-->
|
||||||
|
<!-- </div>-->
|
||||||
|
<!-- </template>-->
|
||||||
|
<!-- </el-dialog>-->
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script setup name="InvTransHis">
|
||||||
|
import { listInvTransHis } from "@/api/wms/InvTransHis";
|
||||||
|
import { listWarehouseInfo } from "@/api/wms/WarehouseInfo";
|
||||||
|
import DataSelect from "@/components/DataSelect/index.vue";
|
||||||
|
|
||||||
|
const { proxy } = getCurrentInstance();
|
||||||
|
const {wms_inv_trans_type} = proxy.useDict("wms_inv_trans_type");
|
||||||
|
|
||||||
|
const InvTransHisList = ref([]);
|
||||||
|
const open = ref(false);
|
||||||
|
const loading = ref(false);
|
||||||
|
const showSearch = ref(true);
|
||||||
|
const ids = ref([]);
|
||||||
|
const single = ref(true);
|
||||||
|
const multiple = ref(true);
|
||||||
|
const total = ref(0);
|
||||||
|
const title = ref("");
|
||||||
|
|
||||||
|
const data = reactive({
|
||||||
|
form: {},
|
||||||
|
queryParams: {
|
||||||
|
pageNum: 1,
|
||||||
|
pageSize: 30,
|
||||||
|
invTransType: null,
|
||||||
|
whsCd: null,
|
||||||
|
stgBinCd: null,
|
||||||
|
itemCd: null,
|
||||||
|
lotNo: null,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const { queryParams, form, rules } = toRefs(data);
|
||||||
|
|
||||||
|
/** 查询入出库履历列表 */
|
||||||
|
function getList() {
|
||||||
|
loading.value = true;
|
||||||
|
listInvTransHis(queryParams.value).then(response => {
|
||||||
|
InvTransHisList.value = response.rows;
|
||||||
|
total.value = response.total;
|
||||||
|
loading.value = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 取消按钮
|
||||||
|
function cancel() {
|
||||||
|
open.value = false;
|
||||||
|
reset();
|
||||||
|
}
|
||||||
|
|
||||||
|
// dialog表单重置(目前无用)
|
||||||
|
function reset() {
|
||||||
|
// form.value = {
|
||||||
|
// deptId: null,
|
||||||
|
// invTransNo: null,
|
||||||
|
// invTransType: null,
|
||||||
|
// whsCd: null,
|
||||||
|
// stgBinCd: null,
|
||||||
|
// palletId: null,
|
||||||
|
// stdUnitQty: null,
|
||||||
|
// pkgUnitQty: null,
|
||||||
|
// transOrderNo: null,
|
||||||
|
// transOrderDetlNo: null,
|
||||||
|
// operator: null,
|
||||||
|
// businessCls: null,
|
||||||
|
// itemCd: null,
|
||||||
|
// lotNo: null,
|
||||||
|
// subLotNo: null,
|
||||||
|
// serialNo: null,
|
||||||
|
// reason: null,
|
||||||
|
// remark1: null,
|
||||||
|
// remark2: null,
|
||||||
|
// remark3: null,
|
||||||
|
// remark4: null,
|
||||||
|
// remark5: null,
|
||||||
|
// updateCount: null,
|
||||||
|
// deleteFlag: null,
|
||||||
|
// createBy: null,
|
||||||
|
// createTime: null,
|
||||||
|
// updateBy: null,
|
||||||
|
// updateTime: null,
|
||||||
|
// remark: null
|
||||||
|
// };
|
||||||
|
// proxy.resetForm("InvTransHisRef");
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 搜索按钮操作 */
|
||||||
|
function handleQuery() {
|
||||||
|
queryParams.value.pageNum = 1;
|
||||||
|
getList();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 重置按钮操作 */
|
||||||
|
function resetQuery() {
|
||||||
|
proxy.resetForm("queryRef");
|
||||||
|
handleQuery();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 多选框选中数据
|
||||||
|
function handleSelectionChange(selection) {
|
||||||
|
ids.value = selection.map(item => item.invTransNo);
|
||||||
|
single.value = selection.length != 1;
|
||||||
|
multiple.value = !selection.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 导出按钮操作 */
|
||||||
|
function handleExport() {
|
||||||
|
proxy.download('wms/InvTransHis/export', {
|
||||||
|
...queryParams.value
|
||||||
|
}, `InvTransHis_${new Date().getTime()}.xlsx`)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 获取仓库数据
|
||||||
|
async function fetchWarehouseData() {
|
||||||
|
const response = await listWarehouseInfo({})
|
||||||
|
const dataList = []
|
||||||
|
response.rows.map(item => {
|
||||||
|
dataList.push({
|
||||||
|
label: item.whsName,
|
||||||
|
value: item.whsCd,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
return dataList
|
||||||
|
}
|
||||||
|
|
||||||
|
//页面打开时查询
|
||||||
|
//getList();
|
||||||
|
</script>
|
||||||
Loading…
Reference in new issue