雷海东 / factory-java · 提交

转到一个项目

作者 lixiang
提交 21f423c4782d9912a1997f550ea2c7d36a758e62 1 个父辈 48b741a0

1、入库记录 

2、出库记录
3、库存明细
4、不良品库
内嵌 并排对比
正在显示 18 个修改的文件 包含 820 行增加 和 168 行删除
... ... @@ -3,17 +3,17 @@ package org.jeecg.modules.erp.trade.controller;
import java.io.UnsupportedEncodingException;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import org.jeecg.modules.erp.trade.entity.TblTradeInventoryIn;
import org.jeecg.modules.erp.trade.entity.TblTradeTenderInfo;
import org.jeecg.modules.erp.trade.service.ITblTradeInventoryInService;
import org.jeecg.modules.erp.trade.service.ITblTradeTenderInfoService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
... ... @@ -62,6 +62,8 @@ public class TblTradeBidSubController {
private ITblTradeInquiryInfoService tblTradeInquiryInfoService;
@Autowired
private ITblTradeTenderInfoService tblTradeTenderInfoService;
@Autowired
private ITblTradeInventoryInService tblTradeInventoryInService;
/**
* 分页列表查询
... ... @@ -337,6 +339,42 @@ public class TblTradeBidSubController {
return Result.OK(tblTradeInquiryInfoList);
}
/**
* 通过合同号和物料编码查询
*
* @param tblTradeBidSub
* @return
*/
@ApiOperation(value="通过合同号和物料编码查询", notes="投标表根据合同号和物料编码进行查询订单信息")
@GetMapping(value = "/queryHtInfoByHthAndWlbm")
public Result<TblTradeBidSub> queryHtInfoByHthAndWlbm( TblTradeBidSub tblTradeBidSub) {
QueryWrapper<TblTradeBidSub> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("hth",tblTradeBidSub.getHth());
queryWrapper.eq("wlbm",tblTradeBidSub.getWlbm());
List<TblTradeBidSub> list = tblTradeBidSubService.list(queryWrapper);
//查询历史入库记录，确认历史入库数量
QueryWrapper<TblTradeInventoryIn> wrapper = new QueryWrapper<>();
wrapper.eq("material_code", tblTradeBidSub.getWlbm());
wrapper.eq("delivery_contract_number", tblTradeBidSub.getHth());
//该物料的入库记录
List<TblTradeInventoryIn> rklog = tblTradeInventoryInService.list(wrapper);
//已入库数量
Integer yrksl = rklog.stream().map(TblTradeInventoryIn::getInventoryQuantity).reduce(Integer::sum).orElse(0);
if(CollectionUtil.isEmpty(list)) {
return Result.OK(new TblTradeBidSub());
}
TblTradeBidSub sub = list.get(0);
String sl = sub.getSl();
int isl = Integer.parseInt(sl);
sub.setSl(String.valueOf(isl-yrksl));
return Result.OK(list.get(0));
}
/**
* 导出excel
*
... ...
... ... @@ -5,6 +5,7 @@ import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
... ... @@ -12,26 +13,27 @@ import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.erp.trade.entity.TblTradeInventory;
import org.jeecg.modules.erp.trade.entity.TblTradeMeterial;
import org.jeecg.modules.erp.trade.service.ITblTradeInventoryService;
import org.jeecg.modules.erp.trade.entity.*;
import org.jeecg.modules.erp.trade.service.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.erp.trade.service.ITblTradeMeterialService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
... ... @@ -42,163 +44,338 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
/**
* @Description: 贸易库存表
* @Author: jeecg-boot
* @Date: 2024-12-24
* @Date: 2024-12-24
* @Version: V1.0
*/
@Api(tags="贸易库存表")
@Api(tags = "贸易库存表")
@RestController
@RequestMapping("/trade/tblTradeInventory")
@Slf4j
public class TblTradeInventoryController extends JeecgController<TblTradeInventory, ITblTradeInventoryService> {
@Autowired
private ITblTradeInventoryService tblTradeInventoryService;
@Autowired
private ITblTradeMeterialService tblTradeMeterialService;
/**
* 分页列表查询
*
* @param tblTradeInventory
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "贸易库存表-分页列表查询")
@ApiOperation(value="贸易库存表-分页列表查询", notes="贸易库存表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<TblTradeInventory>> queryPageList(TblTradeInventory tblTradeInventory,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TblTradeInventory> queryWrapper = QueryGenerator.initQueryWrapper(tblTradeInventory, req.getParameterMap());
Page<TblTradeInventory> page = new Page<TblTradeInventory>(pageNo, pageSize);
IPage<TblTradeInventory> pageList = tblTradeInventoryService.page(page, queryWrapper);
pageList.getRecords().forEach(e->{
// 在库天数
e.setDaysInStock(DateUtil.betweenDay(e.getFirstStorageTime(),new Date(),true));
});
// System.out.println(tblTradeInventory.getMaterialDescription());
// IPage<TblTradeInventory> pageList = new Page<>();
// TblTradeMeterial tblTradeMeterial = new TblTradeMeterial();
// tblTradeMeterial.setMeterialReview(tblTradeInventory.getMaterialDescription());
// QueryWrapper<TblTradeMeterial> queryWrapper = QueryGenerator.initQueryWrapper(tblTradeMeterial, req.getParameterMap());
// Page<TblTradeMeterial> page = new Page<TblTradeMeterial>(pageNo, pageSize);
// IPage<TblTradeMeterial> pageList1 = tblTradeMeterialService.page(page, queryWrapper);
//
// pageList.setCurrent(pageList1.getCurrent());
// pageList.setPages(pageList1.getPages());
// pageList.setSize(pageList1.getSize());
// pageList.setTotal(pageList1.getTotal());
//
// List<TblTradeInventory> records = new ArrayList<>();
// pageList1.getRecords().forEach(e->{
// TblTradeInventory record = new TblTradeInventory(e);
// records.add(record);
// });
//
// pageList.setRecords(records);
return Result.OK(pageList);
}
/**
* 添加
*
* @param tblTradeInventory
* @return
*/
@AutoLog(value = "贸易库存表-添加")
@ApiOperation(value="贸易库存表-添加", notes="贸易库存表-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody TblTradeInventory tblTradeInventory) {
tblTradeInventoryService.save(tblTradeInventory);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param tblTradeInventory
* @return
*/
@AutoLog(value = "贸易库存表-编辑")
@ApiOperation(value="贸易库存表-编辑", notes="贸易库存表-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody TblTradeInventory tblTradeInventory) {
tblTradeInventoryService.updateById(tblTradeInventory);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "贸易库存表-通过id删除")
@ApiOperation(value="贸易库存表-通过id删除", notes="贸易库存表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
tblTradeInventoryService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "贸易库存表-批量删除")
@ApiOperation(value="贸易库存表-批量删除", notes="贸易库存表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.tblTradeInventoryService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "贸易库存表-通过id查询")
@ApiOperation(value="贸易库存表-通过id查询", notes="贸易库存表-通过id查询")
@GetMapping(value = "/queryById")
public Result<TblTradeInventory> queryById(@RequestParam(name="id",required=true) String id) {
TblTradeInventory tblTradeInventory = tblTradeInventoryService.getById(id);
if(tblTradeInventory==null) {
return Result.error("未找到对应数据");
}
return Result.OK(tblTradeInventory);
}
@Autowired
private ITblTradeInventoryService tblTradeInventoryService;
@Autowired
private ITblTradeMeterialService tblTradeMeterialService;
@Autowired
private ITblTradeInventoryInService tblTradeInventoryInService;
@Autowired
private ITblTradeInventoryOutService tblTradeInventoryOutService;
@Autowired
private ITblTradeBidSubService tblTradeBidSubService;
/**
* 导出excel
*
* @param request
* @param tblTradeInventory
*/
* 分页列表查询
*
* @param tblTradeInventory
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "贸易库存表-分页列表查询")
@ApiOperation(value = "贸易库存表-分页列表查询", notes = "贸易库存表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<TblTradeMeterial>> queryPageList(TblTradeInventory tblTradeInventory,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
TblTradeMeterial tblTradeMeterial = new TblTradeMeterial();
tblTradeMeterial.setMeterialReview(tblTradeInventory.getMaterialDescription());
QueryWrapper<TblTradeMeterial> queryWrapper = QueryGenerator.initQueryWrapper(tblTradeMeterial, req.getParameterMap());
Page<TblTradeMeterial> page = new Page<TblTradeMeterial>(pageNo, pageSize);
IPage<TblTradeMeterial> pageList = tblTradeMeterialService.page(page, queryWrapper);
List<TblTradeMeterial> records = pageList.getRecords();
//meterialCode 物料编码list
List<String> collect = records.stream().map(TblTradeMeterial::getMeterialCode).collect(Collectors.toList());
//根据物料编码查询库存
QueryWrapper<TblTradeInventory> tblTradeInventoryQueryWrapper = new QueryWrapper<>();
if (!CollectionUtil.isEmpty(collect)) {
tblTradeInventoryQueryWrapper.in("material_code", collect);
List<TblTradeInventory> list = tblTradeInventoryService.list(tblTradeInventoryQueryWrapper);
Map<String, TblTradeInventory> inventoryMap = list.stream().collect(Collectors.toMap(TblTradeInventory::getMaterialCode, e -> e));
for (TblTradeMeterial record : records) {
record.setActualInventory(inventoryMap.get(record.getMeterialCode()) == null ? 0 : inventoryMap.get(record.getMeterialCode()).getActualInventory() == null ? 0 : inventoryMap.get(record.getMeterialCode()).getActualInventory());
record.setQuantityInTransit(inventoryMap.get(record.getMeterialCode()) == null ? 0 : inventoryMap.get(record.getMeterialCode()).getQuantityInTransit() == null ? 0 : inventoryMap.get(record.getMeterialCode()).getQuantityInTransit());
record.setTotalQuantity(inventoryMap.get(record.getMeterialCode()) == null ? 0 : inventoryMap.get(record.getMeterialCode()).getTotalQuantity() == null ? 0 : inventoryMap.get(record.getMeterialCode()).getTotalQuantity());
record.setFirstStorageTime(inventoryMap.get(record.getMeterialCode()) == null ? null : inventoryMap.get(record.getMeterialCode()).getFirstStorageTime());
record.setLastOutboundTime(inventoryMap.get(record.getMeterialCode()) == null ? null : inventoryMap.get(record.getMeterialCode()).getLastOutboundTime());
if (record.getLastOutboundTime() != null) {
long daysDifference = calculateDaysDifference(new Date(), record.getFirstStorageTime());
record.setDaysInStock((int) daysDifference);
}
if (inventoryMap.get(record.getMeterialCode()) != null) {
TblTradeInventory inventory = inventoryMap.get(record.getMeterialCode());
Integer actualInventory = inventory.getActualInventory();
Integer quantityInTransit = inventory.getQuantityInTransit();
if (actualInventory == null) {
actualInventory = 0;
}
if (quantityInTransit == null) {
quantityInTransit = 0;
}
record.setTotalQuantity(actualInventory + quantityInTransit);
}
}
}
return Result.OK(pageList);
}
public static long calculateDaysDifference(Date startDate, Date endDate) {
long diffInMillies = Math.abs(endDate.getTime() - startDate.getTime());
return TimeUnit.DAYS.convert(diffInMillies, TimeUnit.MILLISECONDS);
}
/**
* 添加
*
* @param tblTradeInventory
* @return
*/
@AutoLog(value = "贸易库存表-添加")
@ApiOperation(value = "贸易库存表-添加", notes = "贸易库存表-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody TblTradeInventory tblTradeInventory) {
//订单验证
Result<String> error = orderVerification(tblTradeInventory);
if (error != null) return error;
TblTradeInventoryIn tblTradeInventoryIn = new TblTradeInventoryIn();
//入库单号
tblTradeInventoryIn.setWaybillNum("BZSIN" + DatePattern.PURE_DATETIME_FORMAT.format(new Date()));
tblTradeInventoryIn.setMaterialCode(tblTradeInventory.getMaterialCode());
tblTradeInventoryIn.setMaterialDescription(tblTradeInventory.getMaterialDescription());
tblTradeInventoryIn.setMeasurementUnit(tblTradeInventory.getMeasurementUnit());
tblTradeInventoryIn.setBrand(tblTradeInventory.getBrand());
tblTradeInventoryIn.setInventoryQuantity(tblTradeInventory.getRksl());
tblTradeInventoryIn.setOperator(tblTradeInventory.getOperator());
tblTradeInventoryIn.setCreateTime(new Date());
tblTradeInventoryIn.setUpdateTime(new Date());
tblTradeInventoryIn.setDeliveryContractNumber(tblTradeInventory.getHth());
tblTradeInventoryIn.setExpressDeliveryNumber(tblTradeInventory.getWldh());
tblTradeInventoryIn.setSupplierName(tblTradeInventory.getCs());
tblTradeInventoryIn.setWarehouse(tblTradeInventory.getWarehouse());
tblTradeInventoryIn.setType("入库");
//根据 物流编码 查询库存信息 如存在库存信息则进行修改库存信息，不存在则新增库存信息
String hth = tblTradeInventory.getHth();
String materialCode = tblTradeInventory.getMaterialCode();
QueryWrapper<TblTradeInventory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("material_code", materialCode);
//库存信息
TblTradeInventory tradeInventory = tblTradeInventoryService.getOne(queryWrapper);
Integer kcl = 0;
if (tradeInventory == null) {
kcl = tblTradeInventory.getRksl();
//新增库存信息
tblTradeInventory.setCreateTime(new Date());
tblTradeInventory.setUpdateTime(new Date());
tblTradeInventory.setFirstStorageTime(new Date());
tblTradeInventory.setActualInventory(tblTradeInventory.getRksl());
tblTradeInventoryService.save(tblTradeInventory);
} else {
//修改库存信息
tblTradeInventory.setId(tradeInventory.getId());
tblTradeInventory.setUpdateTime(new Date());
//当前库存
Integer actualInventory = tradeInventory.getActualInventory();
kcl = tblTradeInventory.getRksl() + actualInventory;
tblTradeInventory.setActualInventory(kcl);
tblTradeInventoryService.updateById(tblTradeInventory);
}
//当前库存量
tblTradeInventoryIn.setActualInventory(kcl);
//新增入库记录
tblTradeInventoryInService.save(tblTradeInventoryIn);
return Result.OK("添加成功！");
}
@Nullable
private Result<String> orderVerification(TblTradeInventory tblTradeInventory) {
QueryWrapper<TblTradeBidSub> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("hth",tblTradeInventory.getHth());
queryWrapper.eq("wlbm",tblTradeInventory.getMaterialCode());
List<TblTradeBidSub> list = tblTradeBidSubService.list(queryWrapper);
if (CollectionUtil.isEmpty(list)) {
return Result.error("该订单不存在！");
}
if (list.size() > 1) {
return Result.error("存在多个相同订单！");
}
//订单信息
TblTradeBidSub tblTradeBidSub = list.get(0);
//订单数量
String sl = tblTradeBidSub.getSl();
//本次入库数量
Integer rksl = tblTradeInventory.getRksl();
if (rksl > Integer.parseInt(sl)){
return Result.error("添加失败，入库数量大于订单数量！");
}
//获取历史入库记录
String code = tblTradeInventory.getMaterialCode();
QueryWrapper<TblTradeInventoryIn> wrapper = new QueryWrapper<>();
wrapper.eq("material_code", code);
wrapper.eq("delivery_contract_number", tblTradeInventory.getHth());
//该物料的入库记录
List<TblTradeInventoryIn> rklog = tblTradeInventoryInService.list(wrapper);
//已入库数量
Integer yrksl = rklog.stream().map(TblTradeInventoryIn::getInventoryQuantity).reduce(Integer::sum).orElse(0);
//预计本次入库数量
int yjsl = yrksl + rksl;
if (yjsl > Integer.parseInt(sl)) {
return Result.error("添加失败，入库数量大于订单数量！");
}
return null;
}
/**
* 出库
*
* @param tblTradeInventory
* @return
*/
@AutoLog(value = "出库")
@ApiOperation(value = "出库", notes = "出库")
@PostMapping(value = "/out")
public Result<String> out(@RequestBody TblTradeInventory tblTradeInventory) {
//根据物料编码获取库存信息
String materialCode = tblTradeInventory.getMaterialCode();
QueryWrapper<TblTradeInventory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("material_code", materialCode);
//库存信息
TblTradeInventory tradeInventory = tblTradeInventoryService.getOne(queryWrapper);
if (tradeInventory == null) {
return Result.error("出库失败，该物料库存信息不存在！");
}
//比对库存剩余数量和出库数量，做校验
Integer outboundQuantity = tblTradeInventory.getOutboundQuantity();
if (outboundQuantity > tradeInventory.getActualInventory()) {
return Result.error("出库失败，出库数量大于库存数量！");
}
//出库
tradeInventory.setActualInventory(tradeInventory.getActualInventory() - outboundQuantity);
tradeInventory.setLastOutboundTime(new Date());
tblTradeInventoryService.updateById(tradeInventory);
//记录出库记录
TblTradeInventoryOut tblTradeInventoryOut = new TblTradeInventoryOut();
tblTradeInventoryOut.setWaybillNumOut("BZSIN" + DatePattern.PURE_DATETIME_FORMAT.format(new Date()));
tblTradeInventoryOut.setMaterialCode(tblTradeInventory.getMaterialCode());
tblTradeInventoryOut.setMaterialDescription(tblTradeInventory.getMaterialDescription());
tblTradeInventoryOut.setMeasurementUnit(tblTradeInventory.getMeasurementUnit());
tblTradeInventoryOut.setBrand(tblTradeInventory.getBrand());
tblTradeInventoryOut.setSalesman(tblTradeInventory.getSalesman());
tblTradeInventoryOut.setCreateTime(new Date());
tblTradeInventoryOut.setUpdateTime(new Date());
tblTradeInventoryOut.setExpressDeliveryNumber(tblTradeInventory.getExpressDeliveryNumber());
tblTradeInventoryOut.setDeliveryContractNumber(tblTradeInventory.getDeliveryContractNumber());
tblTradeInventoryOut.setWarehouse(tblTradeInventory.getWarehouse());
tblTradeInventoryOut.setOutboundQuantity(outboundQuantity);
tblTradeInventoryOut.setDemandUnit(tblTradeInventory.getDemandUnit());
tblTradeInventoryOut.setActualInventory(tradeInventory.getActualInventory());
tblTradeInventoryOutService.save(tblTradeInventoryOut);
return Result.OK("出库成功！");
}
/**
* 编辑
*
* @param tblTradeInventory
* @return
*/
@AutoLog(value = "贸易库存表-编辑")
@ApiOperation(value = "贸易库存表-编辑", notes = "贸易库存表-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody TblTradeInventory tblTradeInventory) {
tblTradeInventoryService.updateById(tblTradeInventory);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "贸易库存表-通过id删除")
@ApiOperation(value = "贸易库存表-通过id删除", notes = "贸易库存表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
tblTradeInventoryService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "贸易库存表-批量删除")
@ApiOperation(value = "贸易库存表-批量删除", notes = "贸易库存表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.tblTradeInventoryService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "贸易库存表-通过id查询")
@ApiOperation(value = "贸易库存表-通过id查询", notes = "贸易库存表-通过id查询")
@GetMapping(value = "/queryById")
public Result<TblTradeInventory> queryById(@RequestParam(name = "id", required = true) String id) {
TblTradeInventory tblTradeInventory = tblTradeInventoryService.getById(id);
if (tblTradeInventory == null) {
return Result.error("未找到对应数据");
}
return Result.OK(tblTradeInventory);
}
/**
* 导出excel
*
* @param request
* @param tblTradeInventory
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, TblTradeInventory tblTradeInventory) {
return super.exportXls(request, tblTradeInventory, TblTradeInventory.class, "贸易库存表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, TblTradeInventory.class);
... ...
package org.jeecg.modules.erp.trade.controller;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
... ... @@ -9,6 +10,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.date.DatePattern;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
... ... @@ -82,6 +85,7 @@ public class TblTradeInventoryDefectiveProductController extends JeecgController
@ApiOperation(value="不良品库-添加", notes="不良品库-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody TblTradeInventoryDefectiveProduct tblTradeInventoryDefectiveProduct) {
tblTradeInventoryDefectiveProduct.setWaybillNum("BZSOUT"+ DatePattern.PURE_DATETIME_FORMAT.format(new Date()));
tblTradeInventoryDefectiveProductService.save(tblTradeInventoryDefectiveProduct);
return Result.OK("添加成功！");
}
... ...
package org.jeecg.modules.erp.trade.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.collection.CollectionUtil;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.erp.trade.entity.TblTradeInventoryIn;
import org.jeecg.modules.erp.trade.entity.TblTradeInventoryOut;
import org.jeecg.modules.erp.trade.service.ITblTradeInventoryInService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
... ... @@ -20,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.erp.trade.service.ITblTradeInventoryOutService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
... ... @@ -49,6 +52,8 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class TblTradeInventoryInController extends JeecgController<TblTradeInventoryIn, ITblTradeInventoryInService> {
@Autowired
private ITblTradeInventoryInService tblTradeInventoryInService;
@Autowired
private ITblTradeInventoryOutService tblTradeInventoryOutService;
/**
* 分页列表查询
... ... @@ -66,9 +71,18 @@ public class TblTradeInventoryInController extends JeecgController<TblTradeInven
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TblTradeInventoryIn> queryWrapper = QueryGenerator.initQueryWrapper(tblTradeInventoryIn, req.getParameterMap());
IPage<TblTradeInventoryIn> pageList = null;
Page<TblTradeInventoryIn> page = new Page<TblTradeInventoryIn>(pageNo, pageSize);
IPage<TblTradeInventoryIn> pageList = tblTradeInventoryInService.page(page, queryWrapper);
if (StringUtils.isNotBlank(tblTradeInventoryIn.getType()) && "出库".equals(tblTradeInventoryIn.getType())) {
pageList = tblTradeInventoryInService.ckPageList(page, tblTradeInventoryIn);
} else if (StringUtils.isNotBlank(tblTradeInventoryIn.getType()) && "入库".equals(tblTradeInventoryIn.getType())) {
pageList = tblTradeInventoryInService.rkPageList(page, tblTradeInventoryIn);
} else {
pageList = tblTradeInventoryInService.pageList(page, tblTradeInventoryIn);
}
return Result.OK(pageList);
}
... ...
... ... @@ -11,6 +11,7 @@ import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
... ... @@ -56,6 +57,23 @@ public class TblTradeMeterialController extends JeecgController<TblTradeMeterial
private ITblTradeMeterialService tblTradeMeterialService;
@Autowired
private ITblTradeInventoryService tblTradeInventoryService;
@ApiOperation(value = "根据物料编号查询物料基础信息", notes = "根据物料编号查询物料基础信息")
@GetMapping(value = "/queryByMaterialCode")
public Result<TblTradeMeterial> queryByMaterialCode(TblTradeMeterial tblTradeMeterial){
String meterialCode = tblTradeMeterial.getMeterialCode();
QueryWrapper<TblTradeMeterial> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("meterial_code", meterialCode);
List<TblTradeMeterial> list = tblTradeMeterialService.list(queryWrapper);
if (CollectionUtil.isEmpty(list)) {
return Result.error("未找到对应物料信息");
}
if (list.size() > 1) {
return Result.error("物料编码重复，请联系管理员");
}
return Result.OK(list.get(0));
}
/**
* 分页列表查询
... ...
... ... @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
... ... @@ -76,14 +77,14 @@ public class TblTradeInventory implements Serializable {
@ApiModelProperty(value = "总价（不含税，元）")
private java.math.BigDecimal totalPrice;
/**首次入库时间*/
@Excel(name = "首次入库时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@Excel(name = "首次入库时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "首次入库时间")
private java.util.Date firstStorageTime;
/**最后一次出库时间*/
@Excel(name = "最后一次出库时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@Excel(name = "最后一次出库时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "最后一次出库时间")
private java.util.Date lastOutboundTime;
... ... @@ -95,19 +96,58 @@ public class TblTradeInventory implements Serializable {
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
@ApiModelProperty(value = "合同/订单号")
private String hth;
@ApiModelProperty(value = "物流单号")
private String wldh;
@ApiModelProperty(value = "供货商名称")
private String cs;
@ApiModelProperty(value = "仓库")
private String warehouse;
@ApiModelProperty(value = "采购员")
private String operator;
@TableField(exist = false)
@ApiModelProperty(value = "采购员")
private String salesman;
@TableField(exist = false)
@ApiModelProperty(value = "入库数量")
private Integer rksl;
@TableField(exist = false)
@ApiModelProperty(value = "不良品数量")
private String blpsl;
@TableField(exist = false)
@ApiModelProperty(value = "异常原因")
private String ycyy;
@TableField(exist = false)
@ApiModelProperty(value = "出库数量")
private Integer outboundQuantity;
@TableField(exist = false)
@ApiModelProperty(value = "供应商合同号")
private String expressDeliveryNumber;
@TableField(exist = false)
@ApiModelProperty(value = "需求单位")
private String demandUnit;
@TableField(exist = false)
@ApiModelProperty(value = "中标合同编号")
private String deliveryContractNumber;
public TblTradeInventory(){}
... ...
... ... @@ -111,4 +111,20 @@ public class TblTradeInventoryDefectiveProduct implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**不良品数量*/
@Excel(name = "不良品数量", width = 15)
@ApiModelProperty(value = "不良品数量")
private Integer blpsl;
/**异常原因*/
@Excel(name = "异常原因", width = 15)
@ApiModelProperty(value = "异常原因")
private Integer ycyy;
/**退换货标志 1：退货 2：换货*/
@Excel(name = "退换货标志", width = 15)
@ApiModelProperty(value = "退换货标志")
private Integer thFlag;
/**退换货单号*/
@Excel(name = "退换货单号", width = 15)
@ApiModelProperty(value = "退换货单号")
private String thNum;
}
... ...
... ... @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
... ... @@ -58,11 +59,11 @@ public class TblTradeInventoryIn implements Serializable {
/**库存量*/
@Excel(name = "库存量", width = 15)
@ApiModelProperty(value = "库存量")
private java.lang.String actualInventory;
private Integer actualInventory;
/**出/入库数量*/
@Excel(name = "出/入库数量", width = 15)
@ApiModelProperty(value = "出/入库数量")
private java.lang.String inventoryQuantity;
private Integer inventoryQuantity;
/**采购/销售*/
@Excel(name = "采购/销售", width = 15)
@ApiModelProperty(value = "采购/销售")
... ... @@ -98,17 +99,21 @@ public class TblTradeInventoryIn implements Serializable {
/**创建人*/
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建人*/
@ApiModelProperty(value = "销售员")
@TableField(exist = false)
private java.lang.String salesman;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
}
... ...
package org.jeecg.modules.erp.trade.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: tbl_trade_inventory_out
* @Author: jeecg-boot
* @Date: 2025-03-12
* @Version: V1.0
*/
@Data
@TableName("tbl_trade_inventory_out")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="tbl_trade_inventory_out对象", description="tbl_trade_inventory_out")
public class TblTradeInventoryOut implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
/**出库单号*/
@Excel(name = "出库单号", width = 15)
@ApiModelProperty(value = "出库单号")
private String waybillNumOut;
/**物料编码*/
@Excel(name = "物料编码", width = 15)
@ApiModelProperty(value = "物料编码")
private String materialCode;
/**物料描述*/
@Excel(name = "物料描述", width = 15)
@ApiModelProperty(value = "物料描述")
private String materialDescription;
/**计量单位*/
@Excel(name = "计量单位", width = 15)
@ApiModelProperty(value = "计量单位")
private String measurementUnit;
/**品牌*/
@Excel(name = "品牌", width = 15)
@ApiModelProperty(value = "品牌")
private String brand;
/**实际库存量*/
@Excel(name = "实际库存量", width = 15)
@ApiModelProperty(value = "实际库存量")
private Integer actualInventory;
/**出库数量*/
@Excel(name = "出库数量", width = 15)
@ApiModelProperty(value = "出库数量")
private Integer outboundQuantity;
/**总数量*/
@Excel(name = "总数量", width = 15)
@ApiModelProperty(value = "总数量")
private String totalQuantity;
/**操作人*/
@Excel(name = "操作人", width = 15)
@ApiModelProperty(value = "操作人")
private String operator;
/**合同单号/快递单号*/
@Excel(name = "合同单号/快递单号", width = 15)
@ApiModelProperty(value = "合同单号/快递单号")
private String expressDeliveryNumber;
/**交货合同编号*/
@Excel(name = "交货合同编号", width = 15)
@ApiModelProperty(value = "交货合同编号")
private String deliveryContractNumber;
/**需求单位*/
@Excel(name = "需求单位", width = 15)
@ApiModelProperty(value = "需求单位")
private String demandUnit;
/**仓库*/
@Excel(name = "仓库", width = 15)
@ApiModelProperty(value = "仓库")
private String warehouse;
/**销售人员*/
@Excel(name = "销售人员", width = 15)
@ApiModelProperty(value = "销售人员")
private String salesman;
/**审核人*/
@Excel(name = "审核人", width = 15)
@ApiModelProperty(value = "审核人")
private String reviewer;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
}
... ...
... ... @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
... ... @@ -100,4 +101,41 @@ public class TblTradeMeterial implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "日期时间")
private java.util.Date otherDate;
/**
* 实际库存数量
*/
@ApiModelProperty(value = "实际库存数量")
@TableField(exist = false)
private Integer actualInventory;
/**
* 在途数量
*/
@ApiModelProperty(value = "在途数量")
@TableField(exist = false)
private Integer quantityInTransit;
/**
* 总数量
*/
@ApiModelProperty(value = "总数量")
@TableField(exist = false)
private Integer totalQuantity;
/**
* 首次入库时间
*/
@ApiModelProperty(value = "首次入库时间")
@TableField(exist = false)
private Date firstStorageTime;
/**
* 最后一次出库时间
*/
@ApiModelProperty(value = "最后一次出库时间")
@TableField(exist = false)
private Date lastOutboundTime;
/**
* 在库天数
*/
@ApiModelProperty(value = "在库天数")
@TableField(exist = false)
private Integer daysInStock;
}
... ...
... ... @@ -2,6 +2,8 @@ package org.jeecg.modules.erp.trade.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.erp.trade.entity.TblTradeInventoryIn;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
... ... @@ -14,4 +16,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface TblTradeInventoryInMapper extends BaseMapper<TblTradeInventoryIn> {
IPage<TblTradeInventoryIn> pageList(Page<TblTradeInventoryIn> page, @Param("param")TblTradeInventoryIn tblTradeInventoryIn);
IPage<TblTradeInventoryIn> ckPageList(Page<TblTradeInventoryIn> page, @Param("param")TblTradeInventoryIn tblTradeInventoryIn);
IPage<TblTradeInventoryIn> rkPageList(Page<TblTradeInventoryIn> page, @Param("param")TblTradeInventoryIn tblTradeInventoryIn);
}
... ...
package org.jeecg.modules.erp.trade.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.erp.trade.entity.TblTradeInventoryOut;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: tbl_trade_inventory_out
* @Author: jeecg-boot
* @Date: 2025-03-12
* @Version: V1.0
*/
public interface TblTradeInventoryOutMapper extends BaseMapper<TblTradeInventoryOut> {
}
... ...
... ... @@ -2,4 +2,104 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.erp.trade.mapper.TblTradeInventoryInMapper">
<select id="pageList" resultType="org.jeecg.modules.erp.trade.entity.TblTradeInventoryIn">
SELECT * FROM (
SELECT
waybill_num AS waybillNum,
material_code AS materialCode,
material_description AS materialDescription,
measurement_unit AS measurementUnit,
brand,
actual_inventory AS actualInventory,
inventory_quantity AS inventoryQuantity,
create_time AS createTime,
create_by AS createBy,
type
FROM tbl_trade_inventory_in where 1=1
<if test="param.materialCode != null and param.materialCode != ''">
AND tbl_trade_inventory_in.material_code = #{param.materialCode}
</if>
<if test="param.materialDescription != null and param.materialDescription != ''">
AND tbl_trade_inventory_in.material_description like concat('%',#{param.materialDescription},'%')
</if>
UNION ALL
SELECT
waybill_num_out AS waybillNum,
material_code AS materialCode,
material_description AS materialDescription,
measurement_unit AS measurementUnit,
brand,
actual_inventory AS actualInventory,
outbound_quantity AS inventoryQuantity,
create_time AS createTime,
create_by AS createBy,
'出库' AS type
FROM tbl_trade_inventory_out where 1=1
<if test="param.materialCode != null and param.materialCode != ''">
AND tbl_trade_inventory_out.material_code = #{param.materialCode}
</if>
<if test="param.materialDescription != null and param.materialDescription != ''">
AND tbl_trade_inventory_out.material_description like concat('%',#{param.materialDescription},'%')
</if>
)
AS combined_results
ORDER BY createTime DESC;
</select>
<select id="ckPageList" resultType="org.jeecg.modules.erp.trade.entity.TblTradeInventoryIn">
SELECT
waybill_num_out AS waybillNum,
material_code AS materialCode,
material_description AS materialDescription,
measurement_unit AS measurementUnit,
brand,
actual_inventory AS actualInventory,
outbound_quantity AS inventoryQuantity,
create_time AS createTime,
create_by AS createBy,
warehouse AS warehouse,
express_delivery_number AS expressDeliveryNumber,
delivery_contract_number AS deliveryContractNumber,
demand_unit AS demandUnit,
salesman AS salesman,
demand_unit AS createBy,
'出库' AS type
FROM tbl_trade_inventory_out where 1=1
<if test="param.materialCode != null and param.materialCode != ''">
AND tbl_trade_inventory_out.material_code = #{param.materialCode}
</if>
<if test="param.materialDescription != null and param.materialDescription != ''">
AND tbl_trade_inventory_out.material_description like concat('%',#{param.materialDescription},'%')
</if>
ORDER BY createTime DESC;
</select>
<select id="rkPageList" resultType="org.jeecg.modules.erp.trade.entity.TblTradeInventoryIn">
SELECT
waybill_num AS waybillNum,
material_code AS materialCode,
material_description AS materialDescription,
measurement_unit AS measurementUnit,
brand,
actual_inventory AS actualInventory,
inventory_quantity AS inventoryQuantity,
create_time AS createTime,
create_by AS createBy,
delivery_contract_number AS deliveryContractNumber,
express_delivery_number AS expressDeliveryNumber,
supplier_name AS supplierName,
operator AS operator,
warehouse AS warehouse,
type
FROM tbl_trade_inventory_in where 1=1
<if test="param.materialCode != null and param.materialCode != ''">
AND tbl_trade_inventory_in.material_code = #{param.materialCode}
</if>
<if test="param.materialDescription != null and param.materialDescription != ''">
AND tbl_trade_inventory_in.material_description like concat('%',#{param.materialDescription},'%')
</if>
ORDER BY createTime DESC;
</select>
</mapper>
\ No newline at end of file
... ...
<?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.jeecg.modules.erp.trade.mapper.TblTradeInventoryOutMapper">
</mapper>
\ No newline at end of file
... ...
package org.jeecg.modules.erp.trade.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.erp.trade.entity.TblTradeInventoryIn;
import com.baomidou.mybatisplus.extension.service.IService;
... ... @@ -11,4 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ITblTradeInventoryInService extends IService<TblTradeInventoryIn> {
IPage<TblTradeInventoryIn> pageList(Page<TblTradeInventoryIn> page, TblTradeInventoryIn tblTradeInventoryIn);
IPage<TblTradeInventoryIn> ckPageList(Page<TblTradeInventoryIn> page, TblTradeInventoryIn tblTradeInventoryIn);
IPage<TblTradeInventoryIn> rkPageList(Page<TblTradeInventoryIn> page, TblTradeInventoryIn tblTradeInventoryIn);
}
... ...
package org.jeecg.modules.erp.trade.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.erp.trade.entity.TblTradeInventoryOut;
/**
* @Description: tbl_trade_inventory_out
* @Author: jeecg-boot
* @Date: 2025-03-12
* @Version: V1.0
*/
public interface ITblTradeInventoryOutService extends IService<TblTradeInventoryOut> {
}
... ...
package org.jeecg.modules.erp.trade.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.erp.trade.entity.TblTradeInventoryIn;
import org.jeecg.modules.erp.trade.mapper.TblTradeInventoryInMapper;
import org.jeecg.modules.erp.trade.service.ITblTradeInventoryInService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
... ... @@ -16,4 +19,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class TblTradeInventoryInServiceImpl extends ServiceImpl<TblTradeInventoryInMapper, TblTradeInventoryIn> implements ITblTradeInventoryInService {
@Autowired
private TblTradeInventoryInMapper tblTradeInventoryInMapper;
@Override
public IPage<TblTradeInventoryIn> pageList(Page<TblTradeInventoryIn> page, TblTradeInventoryIn tblTradeInventoryIn) {
return tblTradeInventoryInMapper.pageList(page, tblTradeInventoryIn);
}
@Override
public IPage<TblTradeInventoryIn> ckPageList(Page<TblTradeInventoryIn> page, TblTradeInventoryIn tblTradeInventoryIn) {
return tblTradeInventoryInMapper.ckPageList(page, tblTradeInventoryIn);
}
@Override
public IPage<TblTradeInventoryIn> rkPageList(Page<TblTradeInventoryIn> page, TblTradeInventoryIn tblTradeInventoryIn) {
return tblTradeInventoryInMapper.rkPageList(page, tblTradeInventoryIn);
}
}
... ...
package org.jeecg.modules.erp.trade.service.impl;
import org.jeecg.modules.erp.trade.entity.TblTradeInventoryOut;
import org.jeecg.modules.erp.trade.mapper.TblTradeInventoryOutMapper;
import org.jeecg.modules.erp.trade.service.ITblTradeInventoryOutService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: tbl_trade_inventory_out
* @Author: jeecg-boot
* @Date: 2025-03-12
* @Version: V1.0
*/
@Service
public class TblTradeInventoryOutServiceImpl extends ServiceImpl<TblTradeInventoryOutMapper, TblTradeInventoryOut> implements ITblTradeInventoryOutService {
}
... ...