Compare commits
2 Commits
c9b98623cc
...
9915eff6c7
| Author | SHA1 | Date |
|---|---|---|
 wanghao
|
9915eff6c7 | 1 month ago |
|
wanghao
|
e049e70371 | 1 month ago |
@ -0,0 +1,117 @@
|
||||
package org.dromara.wms.controller;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.constraints.*;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import org.dromara.wms.domain.WmsMaterialTransferRecord;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.dromara.common.idempotent.annotation.RepeatSubmit;
|
||||
import org.dromara.common.log.annotation.Log;
|
||||
import org.dromara.common.web.core.BaseController;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.core.domain.R;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import org.dromara.common.log.enums.BusinessType;
|
||||
import org.dromara.common.excel.utils.ExcelUtil;
|
||||
import org.dromara.wms.domain.vo.WmsMaterialTransferRecordVo;
|
||||
import org.dromara.wms.domain.bo.WmsMaterialTransferRecordBo;
|
||||
import org.dromara.wms.service.IWmsMaterialTransferRecordService;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
|
||||
/**
|
||||
* 物料调拨
|
||||
* 前端访问路由地址为:/wms/materialTransferRecord
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-12-01
|
||||
*/
|
||||
@Validated
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping("/materialTransferRecord")
|
||||
public class WmsMaterialTransferRecordController extends BaseController {
|
||||
|
||||
private final IWmsMaterialTransferRecordService wmsMaterialTransferRecordService;
|
||||
|
||||
/**
|
||||
* 查询物料调拨列表
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferRecord:list")
|
||||
@GetMapping("/list")
|
||||
public TableDataInfo<WmsMaterialTransferRecordVo> list(WmsMaterialTransferRecordBo bo, PageQuery pageQuery) {
|
||||
return wmsMaterialTransferRecordService.queryPageList(bo, pageQuery);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出物料调拨列表
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferRecord:export")
|
||||
@Log(title = "物料调拨", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(WmsMaterialTransferRecordBo bo, HttpServletResponse response) {
|
||||
List<WmsMaterialTransferRecordVo> list = wmsMaterialTransferRecordService.queryList(bo);
|
||||
ExcelUtil.exportExcel(list, "物料调拨", WmsMaterialTransferRecordVo.class, response);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取物料调拨详细信息
|
||||
*
|
||||
* @param transferRecordId 主键
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferRecord:query")
|
||||
@GetMapping("/{transferRecordId}")
|
||||
public R<WmsMaterialTransferRecordVo> getInfo(@NotNull(message = "主键不能为空")
|
||||
@PathVariable("transferRecordId") Long transferRecordId) {
|
||||
return R.ok(wmsMaterialTransferRecordService.queryById(transferRecordId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增物料调拨
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferRecord:add")
|
||||
@Log(title = "物料调拨", businessType = BusinessType.INSERT)
|
||||
@RepeatSubmit()
|
||||
@PostMapping()
|
||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody List<WmsMaterialTransferRecord> bo) {
|
||||
return toAjax(wmsMaterialTransferRecordService.insertByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改物料调拨
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferRecord:edit")
|
||||
@Log(title = "物料调拨", businessType = BusinessType.UPDATE)
|
||||
@RepeatSubmit()
|
||||
@PutMapping()
|
||||
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsMaterialTransferRecordBo bo) {
|
||||
return toAjax(wmsMaterialTransferRecordService.updateByBo(bo));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除物料调拨
|
||||
*
|
||||
* @param transferRecordIds 主键串
|
||||
*/
|
||||
@SaCheckPermission("wms:materialTransferRecord:remove")
|
||||
@Log(title = "物料调拨", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{transferRecordIds}")
|
||||
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
||||
@PathVariable("transferRecordIds") Long[] transferRecordIds) {
|
||||
return toAjax(wmsMaterialTransferRecordService.deleteWithValidByIds(List.of(transferRecordIds), true));
|
||||
}
|
||||
|
||||
/**
|
||||
* 下拉框查询物料调拨列表
|
||||
*/
|
||||
@GetMapping("/getWmsMaterialTransferRecordList")
|
||||
public R<List<WmsMaterialTransferRecordVo>> getWmsMaterialTransferRecordList(WmsMaterialTransferRecordBo bo) {
|
||||
List<WmsMaterialTransferRecordVo> list = wmsMaterialTransferRecordService.queryList(bo);
|
||||
return R.ok(list);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
package org.dromara.wms.domain.bo;
|
||||
|
||||
import org.dromara.wms.domain.WmsMaterialTransferRecord;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import jakarta.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 物料调拨业务对象 wms_material_transfer_record
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-12-01
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = WmsMaterialTransferRecord.class, reverseConvertGenerate = false)
|
||||
public class WmsMaterialTransferRecordBo extends BaseEntity {
|
||||
private Long transferRecordId;
|
||||
/**
|
||||
* 物料ID
|
||||
*/
|
||||
private Long materielId;
|
||||
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
private String batchNumber;
|
||||
|
||||
/**
|
||||
* 调拨数量
|
||||
*/
|
||||
private Double transferQty;
|
||||
|
||||
/**
|
||||
* 单位
|
||||
*/
|
||||
private String unitName;
|
||||
|
||||
/**
|
||||
* 调出仓库
|
||||
*/
|
||||
@NotNull(message = "调出仓库不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long transferOutStoreId;
|
||||
|
||||
/**
|
||||
* 调入仓库
|
||||
*/
|
||||
@NotNull(message = "调入仓库不能为空", groups = { AddGroup.class, EditGroup.class })
|
||||
private Long transferInStoreId;
|
||||
|
||||
/**
|
||||
* 库存id
|
||||
*/
|
||||
private Long inventoryDetailsId;
|
||||
|
||||
/**
|
||||
* 成品编码
|
||||
*/
|
||||
private String productCode;
|
||||
|
||||
/**
|
||||
* 成品名称
|
||||
*/
|
||||
private String productName;
|
||||
private String externalBrand;
|
||||
|
||||
/**
|
||||
* 成品描述
|
||||
*/
|
||||
private String productSpe;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package org.dromara.wms.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.dromara.wms.domain.WmsMaterialTransferRecord;
|
||||
import org.dromara.wms.domain.vo.WmsMaterialTransferRecordVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* 物料调拨Mapper接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-12-01
|
||||
*/
|
||||
@Repository
|
||||
public interface WmsMaterialTransferRecordMapper extends BaseMapperPlus<WmsMaterialTransferRecord, WmsMaterialTransferRecordVo> {
|
||||
|
||||
/**
|
||||
* 查询物料调拨列表
|
||||
*
|
||||
* @param page 分页
|
||||
* @param queryWrapper 条件
|
||||
* @return 物料调拨集合
|
||||
*/
|
||||
public Page<WmsMaterialTransferRecordVo> selectCustomWmsMaterialTransferRecordVoList(@Param("page") Page<WmsMaterialTransferRecordVo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<WmsMaterialTransferRecord> queryWrapper);
|
||||
|
||||
/**
|
||||
* 查询物料调拨列表
|
||||
*
|
||||
* @param queryWrapper 条件
|
||||
* @return 物料调拨集合
|
||||
*/
|
||||
public List<WmsMaterialTransferRecordVo> selectCustomWmsMaterialTransferRecordVoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<WmsMaterialTransferRecord> queryWrapper);
|
||||
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package org.dromara.wms.service;
|
||||
|
||||
import org.dromara.wms.domain.WmsMaterialTransferRecord;
|
||||
import org.dromara.wms.domain.vo.WmsMaterialTransferRecordVo;
|
||||
import org.dromara.wms.domain.bo.WmsMaterialTransferRecordBo;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 物料调拨Service接口
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-12-01
|
||||
*/
|
||||
public interface IWmsMaterialTransferRecordService {
|
||||
|
||||
/**
|
||||
* 查询物料调拨
|
||||
*
|
||||
* @param transferRecordId 主键
|
||||
* @return 物料调拨
|
||||
*/
|
||||
WmsMaterialTransferRecordVo queryById(Long transferRecordId);
|
||||
|
||||
/**
|
||||
* 分页查询物料调拨列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 物料调拨分页列表
|
||||
*/
|
||||
TableDataInfo<WmsMaterialTransferRecordVo> queryPageList(WmsMaterialTransferRecordBo bo, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查询符合条件的物料调拨列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 物料调拨列表
|
||||
*/
|
||||
List<WmsMaterialTransferRecordVo> queryList(WmsMaterialTransferRecordBo bo);
|
||||
|
||||
/**
|
||||
* 新增物料调拨
|
||||
*
|
||||
* @param bo 物料调拨
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
Boolean insertByBo(List<WmsMaterialTransferRecord> bo);
|
||||
|
||||
/**
|
||||
* 修改物料调拨
|
||||
*
|
||||
* @param bo 物料调拨
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
Boolean updateByBo(WmsMaterialTransferRecordBo bo);
|
||||
|
||||
/**
|
||||
* 校验并批量删除物料调拨信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
|
||||
}
|
||||
@ -0,0 +1,164 @@
|
||||
package org.dromara.wms.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.github.yulichang.toolkit.JoinWrappers;
|
||||
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.common.core.utils.MapstructUtils;
|
||||
import org.dromara.common.core.utils.StringUtils;
|
||||
import org.dromara.common.mybatis.core.page.PageQuery;
|
||||
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
||||
import org.dromara.wms.domain.WmsBaseProduct;
|
||||
import org.dromara.wms.domain.WmsInventoryDetails;
|
||||
import org.dromara.wms.domain.WmsMaterialTransferRecord;
|
||||
import org.dromara.wms.domain.bo.WmsMaterialTransferRecordBo;
|
||||
import org.dromara.wms.domain.vo.WmsMaterialTransferRecordVo;
|
||||
import org.dromara.wms.mapper.WmsInventoryDetailsMapper;
|
||||
import org.dromara.wms.mapper.WmsMaterialTransferRecordMapper;
|
||||
import org.dromara.wms.service.IWmsMaterialTransferRecordService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 物料调拨Service业务层处理
|
||||
*
|
||||
* @author Yinq
|
||||
* @date 2025-12-01
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WmsMaterialTransferRecordServiceImpl implements IWmsMaterialTransferRecordService {
|
||||
|
||||
private final WmsMaterialTransferRecordMapper baseMapper;
|
||||
|
||||
private final WmsInventoryDetailsMapper wmsInventoryDetailsMapper;
|
||||
/**
|
||||
* 查询物料调拨
|
||||
*
|
||||
* @param transferRecordId 主键
|
||||
* @return 物料调拨
|
||||
*/
|
||||
@Override
|
||||
public WmsMaterialTransferRecordVo queryById(Long transferRecordId) {
|
||||
return baseMapper.selectVoById(transferRecordId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询物料调拨列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @param pageQuery 分页参数
|
||||
* @return 物料调拨分页列表
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsMaterialTransferRecordVo> queryPageList(WmsMaterialTransferRecordBo bo, PageQuery pageQuery) {
|
||||
MPJLambdaWrapper<WmsMaterialTransferRecord> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsMaterialTransferRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询符合条件的物料调拨列表
|
||||
*
|
||||
* @param bo 查询条件
|
||||
* @return 物料调拨列表
|
||||
*/
|
||||
@Override
|
||||
public List<WmsMaterialTransferRecordVo> queryList(WmsMaterialTransferRecordBo bo) {
|
||||
MPJLambdaWrapper<WmsMaterialTransferRecord> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
}
|
||||
|
||||
private MPJLambdaWrapper<WmsMaterialTransferRecord> buildQueryWrapper(WmsMaterialTransferRecordBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
MPJLambdaWrapper<WmsMaterialTransferRecord> lqw = JoinWrappers.lambda(WmsMaterialTransferRecord.class)
|
||||
.selectAll(WmsMaterialTransferRecord.class)
|
||||
.eq(WmsMaterialTransferRecord::getDelFlag, "0")
|
||||
.eq(bo.getMaterielId() != null, WmsMaterialTransferRecord::getMaterielId, bo.getMaterielId())
|
||||
.eq(StringUtils.isNotBlank(bo.getBatchNumber()), WmsMaterialTransferRecord::getBatchNumber, bo.getBatchNumber())
|
||||
.eq(bo.getTransferOutStoreId() != null, WmsMaterialTransferRecord::getTransferOutStoreId, bo.getTransferOutStoreId())
|
||||
.eq(bo.getTransferInStoreId() != null, WmsMaterialTransferRecord::getTransferInStoreId, bo.getTransferInStoreId())
|
||||
.leftJoin(WmsBaseProduct.class, WmsBaseProduct::getProductId, WmsMaterialTransferRecord::getMaterielId)
|
||||
.select(WmsBaseProduct::getProductCode, WmsBaseProduct::getProductName, WmsBaseProduct::getExternalBrand, WmsBaseProduct::getProductSpe)
|
||||
.like(bo.getProductCode() != null, WmsBaseProduct::getProductCode, bo.getProductCode())
|
||||
.like(bo.getProductName() != null, WmsBaseProduct::getProductName, bo.getProductName());
|
||||
return lqw;
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增物料调拨
|
||||
*
|
||||
* @param bo 物料调拨
|
||||
* @return 是否新增成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean insertByBo(List<WmsMaterialTransferRecord> bo) {
|
||||
baseMapper.insert(bo);
|
||||
// 修改库存
|
||||
bo.forEach(record -> {
|
||||
// Long transferOutStoreId = record.getTransferOutStoreId();
|
||||
|
||||
Long inventoryDetailsId = record.getInventoryDetailsId(); // 库存ID
|
||||
Double transferQty = record.getTransferQty(); // 调拨数量
|
||||
// 库存验证
|
||||
WmsInventoryDetails inventoryDetails = wmsInventoryDetailsMapper.selectById( inventoryDetailsId);
|
||||
double lossQty = inventoryDetails.getInventoryAmount() - transferQty;
|
||||
if (lossQty < 0) {
|
||||
throw new IllegalArgumentException("库存不足");
|
||||
}
|
||||
// 出库库存减少
|
||||
WmsInventoryDetails outDetails = new WmsInventoryDetails();
|
||||
outDetails.setInventoryDetailsId(inventoryDetailsId);
|
||||
outDetails.setInventoryAmount(lossQty);
|
||||
if (lossQty == 0) {
|
||||
outDetails.setDelFlag("1");
|
||||
}
|
||||
wmsInventoryDetailsMapper.updateById(outDetails);
|
||||
// 入库库存增加
|
||||
WmsInventoryDetails inDetails = new WmsInventoryDetails();
|
||||
inDetails.setInventoryAmount(transferQty);// 入库数量
|
||||
inDetails.setWarehouseId(record.getTransferInStoreId()); //仓库
|
||||
inDetails.setInventoryDetailsId(null);
|
||||
inDetails.setMaterielId(inventoryDetails.getMaterielId());
|
||||
inDetails.setUnitPrice(inventoryDetails.getUnitPrice());
|
||||
|
||||
wmsInventoryDetailsMapper.insert(inDetails);
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改物料调拨
|
||||
*
|
||||
* @param bo 物料调拨
|
||||
* @return 是否修改成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean updateByBo(WmsMaterialTransferRecordBo bo) {
|
||||
WmsMaterialTransferRecord update = MapstructUtils.convert(bo, WmsMaterialTransferRecord.class);
|
||||
return baseMapper.updateById(update) > 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 校验并批量删除物料调拨信息
|
||||
*
|
||||
* @param ids 待删除的主键集合
|
||||
* @param isValid 是否进行有效性校验
|
||||
* @return 是否删除成功
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
||||
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
<?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="org.dromara.wms.mapper.WmsMaterialTransferRecordMapper">
|
||||
<resultMap type="org.dromara.wms.domain.vo.WmsMaterialTransferRecordVo" id="WmsMaterialTransferRecordResult">
|
||||
</resultMap>
|
||||
|
||||
<select id="selectCustomWmsMaterialTransferRecordVoList" resultMap="WmsMaterialTransferRecordResult">
|
||||
select transfer_record_id, materiel_id, batch_number, transfer_qty, unit_name, transfer_out_store_id, transfer_in_store_id, inventory_details_id, tenant_id, del_flag, create_dept, create_by, create_time, update_by, update_time from wms_material_transfer_record t
|
||||
${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue