提交 2a9a5339 authored 作者: Wangjiajie's avatar Wangjiajie

把之前打的代码装进去

上级 6e39fcc5
package org.jeecg.modules.iost.basedata.controller;
import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
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.iost.basedata.entity.HouseLingjianhuo;
import org.jeecg.modules.iost.basedata.service.HouseILingjianhuoService;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 领取拣货单表
* @Author: jeecg-boot
* @Date: 2021-06-08
* @Version: V1.0
*/
@Api(tags="领取拣货单表")
@RestController
@RequestMapping("/basedata/lingjianhuo")
@Slf4j
public class HouseLingjianhuoController extends JeecgController<HouseLingjianhuo, HouseILingjianhuoService> {
@Autowired
private HouseILingjianhuoService lingjianhuoService;
/**
* 分页列表查询
*
* @param houseLingjianhuo
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "领取拣货单表-分页列表查询")
@ApiOperation(value="领取拣货单表-分页列表查询", notes="领取拣货单表-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(HouseLingjianhuo houseLingjianhuo,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<HouseLingjianhuo> queryWrapper = QueryGenerator.initQueryWrapper(houseLingjianhuo, req.getParameterMap());
Page<HouseLingjianhuo> page = new Page<HouseLingjianhuo>(pageNo, pageSize);
IPage<HouseLingjianhuo> pageList = lingjianhuoService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param houseLingjianhuo
* @return
*/
@AutoLog(value = "领取拣货单表-添加")
@ApiOperation(value="领取拣货单表-添加", notes="领取拣货单表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody HouseLingjianhuo houseLingjianhuo) {
lingjianhuoService.save(houseLingjianhuo);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param houseLingjianhuo
* @return
*/
@AutoLog(value = "领取拣货单表-编辑")
@ApiOperation(value="领取拣货单表-编辑", notes="领取拣货单表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody HouseLingjianhuo houseLingjianhuo) {
lingjianhuoService.updateById(houseLingjianhuo);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "领取拣货单表-通过id删除")
@ApiOperation(value="领取拣货单表-通过id删除", notes="领取拣货单表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
lingjianhuoService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "领取拣货单表-批量删除")
@ApiOperation(value="领取拣货单表-批量删除", notes="领取拣货单表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.lingjianhuoService.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<?> queryById(@RequestParam(name="id",required=true) String id) {
HouseLingjianhuo houseLingjianhuo = lingjianhuoService.getById(id);
if(houseLingjianhuo ==null) {
return Result.error("未找到对应数据");
}
return Result.OK(houseLingjianhuo);
}
/**
* 导出excel
*
* @param request
* @param houseLingjianhuo
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HouseLingjianhuo houseLingjianhuo) {
return super.exportXls(request, houseLingjianhuo, HouseLingjianhuo.class, "领取拣货单表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, HouseLingjianhuo.class);
}
}
package org.jeecg.modules.iost.basedata.controller;
import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
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.iost.basedata.entity.HousePickingtable;
import org.jeecg.modules.iost.basedata.service.HouseIPickingtableService;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 拣货单表
* @Author: jeecg-boot
* @Date: 2021-06-08
* @Version: V1.0
*/
@Api(tags="拣货单表")
@RestController
@RequestMapping("/basedata/pickingtable")
@Slf4j
public class HousePickingtableController extends JeecgController<HousePickingtable, HouseIPickingtableService> {
@Autowired
private HouseIPickingtableService pickingtableService;
/**
* 分页列表查询
*
* @param housePickingtable
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "拣货单表-分页列表查询")
@ApiOperation(value="拣货单表-分页列表查询", notes="拣货单表-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(HousePickingtable housePickingtable,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<HousePickingtable> queryWrapper = QueryGenerator.initQueryWrapper(housePickingtable, req.getParameterMap());
Page<HousePickingtable> page = new Page<HousePickingtable>(pageNo, pageSize);
IPage<HousePickingtable> pageList = pickingtableService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param housePickingtable
* @return
*/
@AutoLog(value = "拣货单表-添加")
@ApiOperation(value="拣货单表-添加", notes="拣货单表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody HousePickingtable housePickingtable) {
pickingtableService.save(housePickingtable);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param housePickingtable
* @return
*/
@AutoLog(value = "拣货单表-编辑")
@ApiOperation(value="拣货单表-编辑", notes="拣货单表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody HousePickingtable housePickingtable) {
pickingtableService.updateById(housePickingtable);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "拣货单表-通过id删除")
@ApiOperation(value="拣货单表-通过id删除", notes="拣货单表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
pickingtableService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "拣货单表-批量删除")
@ApiOperation(value="拣货单表-批量删除", notes="拣货单表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.pickingtableService.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<?> queryById(@RequestParam(name="id",required=true) String id) {
HousePickingtable housePickingtable = pickingtableService.getById(id);
if(housePickingtable ==null) {
return Result.error("未找到对应数据");
}
return Result.OK(housePickingtable);
}
/**
* 根据状态查询数据
*
* @param
* @return
*/
@AutoLog(value = "拣货单表-根据状态查询数据")
@ApiOperation(value="拣货单表-根据状态查询数据", notes="拣货单表-根据状态查询数据")
@GetMapping(value = "/selectzhuangtai0")
public Result<?> selectzhuangtai(@RequestParam int zhaungtai){
List<HousePickingtable> list = pickingtableService.getBaseMapper().selectList(new QueryWrapper<HousePickingtable>().eq("Zhuangtai",zhaungtai));
if(list==null) {
return Result.error("未找到对应数据");
}
return Result.OK(list);
}
/**
* 导出excel
*
* @param request
* @param housePickingtable
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HousePickingtable housePickingtable) {
return super.exportXls(request, housePickingtable, HousePickingtable.class, "拣货单表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, HousePickingtable.class);
}
}
package org.jeecg.modules.iost.basedata.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.iost.basedata.entity.HouseProduct;
import org.jeecg.modules.iost.basedata.service.HouseIProductService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
* @Description: 采购产品订单表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
@Api(tags="采购产品订单表")
@RestController
@RequestMapping("/basedata/product")
@Slf4j
public class HouseProductController extends JeecgController<HouseProduct, HouseIProductService> {
@Autowired
private HouseIProductService productService;
/**
* 分页列表查询
*
* @param product
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "采购产品订单表-分页列表查询")
@ApiOperation(value="采购产品订单表-分页列表查询", notes="采购产品订单表-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(HouseProduct product,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<HouseProduct> queryWrapper = QueryGenerator.initQueryWrapper(product, req.getParameterMap());
Page<HouseProduct> page = new Page<HouseProduct>(pageNo, pageSize);
IPage<HouseProduct> pageList = productService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param product
* @return
*/
@AutoLog(value = "采购产品订单表-添加")
@ApiOperation(value="采购产品订单表-添加", notes="采购产品订单表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody HouseProduct product) {
productService.save(product);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param product
* @return
*/
@AutoLog(value = "采购产品订单表-编辑")
@ApiOperation(value="采购产品订单表-编辑", notes="采购产品订单表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody HouseProduct product) {
productService.updateById(product);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "采购产品订单表-通过id删除")
@ApiOperation(value="采购产品订单表-通过id删除", notes="采购产品订单表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
productService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "采购产品订单表-批量删除")
@ApiOperation(value="采购产品订单表-批量删除", notes="采购产品订单表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.productService.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<?> queryById(@RequestParam(name="id",required=true) String id) {
HouseProduct product = productService.getById(id);
if(product==null) {
return Result.error("未找到对应数据");
}
return Result.OK(product);
}
@AutoLog(value = "采购产品订单表-通过采购订单号查询")
@ApiOperation(value="采购产品订单表-通过采购订单号查询", notes="采购产品订单表-通过采购订单号查询")
@GetMapping(value = "/queryPageOne")
public Result<?> queryPageOne(@RequestParam(name="purchaseid",required=true) String purchaseid) {
HouseProduct product = productService.getOne(new QueryWrapper<HouseProduct>().like("purchaseid",purchaseid));
if(product==null) {
return Result.error("未找到对应数据");
}
return Result.OK(product);
}
/**
* 导出excel
*
* @param request
* @param product
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HouseProduct product) {
return super.exportXls(request, product, HouseProduct.class, "采购产品订单表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, HouseProduct.class);
}
}
package org.jeecg.modules.iost.basedata.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.iost.basedata.entity.HouseRelocation;
import org.jeecg.modules.iost.basedata.service.HouseIRelocationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
* @Description: 移库记录表
* @Author: jeecg-boot
* @Date: 2021-06-07
* @Version: V1.0
*/
@Api(tags="移库记录表")
@RestController
@RequestMapping("/basedata/relocation")
@Slf4j
public class HouseRelocationController extends JeecgController<HouseRelocation, HouseIRelocationService> {
@Autowired
private HouseIRelocationService relocationService;
/**
* 分页列表查询
*
* @param relocation
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "移库记录表-分页列表查询")
@ApiOperation(value="移库记录表-分页列表查询", notes="移库记录表-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(HouseRelocation relocation,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<HouseRelocation> queryWrapper = QueryGenerator.initQueryWrapper(relocation, req.getParameterMap());
Page<HouseRelocation> page = new Page<HouseRelocation>(pageNo, pageSize);
IPage<HouseRelocation> pageList = relocationService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param relocation
* @return
*/
@AutoLog(value = "移库记录表-添加")
@ApiOperation(value="移库记录表-添加", notes="移库记录表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody HouseRelocation relocation) {
relocationService.save(relocation);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param relocation
* @return
*/
@AutoLog(value = "移库记录表-编辑")
@ApiOperation(value="移库记录表-编辑", notes="移库记录表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody HouseRelocation relocation) {
relocationService.updateById(relocation);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "移库记录表-通过id删除")
@ApiOperation(value="移库记录表-通过id删除", notes="移库记录表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
relocationService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "移库记录表-批量删除")
@ApiOperation(value="移库记录表-批量删除", notes="移库记录表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.relocationService.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<?> queryById(@RequestParam(name="id",required=true) String id) {
HouseRelocation relocation = relocationService.getById(id);
if(relocation==null) {
return Result.error("未找到对应数据");
}
return Result.OK(relocation);
}
/**
* 导出excel
*
* @param request
* @param relocation
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HouseRelocation relocation) {
return super.exportXls(request, relocation, HouseRelocation.class, "移库记录表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, HouseRelocation.class);
}
}
package org.jeecg.modules.iost.basedata.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.iost.basedata.entity.HouseWarehouse;
import org.jeecg.modules.iost.basedata.service.HouseIWarehouseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
* @Description: 仓库列表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
@Api(tags="仓库列表")
@RestController
@RequestMapping("/basedata/warehouse")
@Slf4j
public class HouseWarehouseController extends JeecgController<HouseWarehouse, HouseIWarehouseService> {
@Autowired
private HouseIWarehouseService warehouseService;
/**
* 分页列表查询
*
* @param houseWarehouse
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "仓库列表-分页列表查询")
@ApiOperation(value="仓库列表-分页列表查询", notes="仓库列表-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(HouseWarehouse houseWarehouse,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<HouseWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(houseWarehouse, req.getParameterMap());
Page<HouseWarehouse> page = new Page<HouseWarehouse>(pageNo, pageSize);
IPage<HouseWarehouse> pageList = warehouseService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param houseWarehouse
* @return
*/
@AutoLog(value = "仓库列表-添加")
@ApiOperation(value="仓库列表-添加", notes="仓库列表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody HouseWarehouse houseWarehouse) {
warehouseService.save(houseWarehouse);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param houseWarehouse
* @return
*/
@AutoLog(value = "仓库列表-编辑")
@ApiOperation(value="仓库列表-编辑", notes="仓库列表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody HouseWarehouse houseWarehouse) {
warehouseService.updateById(houseWarehouse);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "仓库列表-通过id删除")
@ApiOperation(value="仓库列表-通过id删除", notes="仓库列表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
warehouseService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "仓库列表-批量删除")
@ApiOperation(value="仓库列表-批量删除", notes="仓库列表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.warehouseService.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<?> queryById(@RequestParam(name="id",required=true) String id) {
HouseWarehouse houseWarehouse = warehouseService.getById(id);
if(houseWarehouse ==null) {
return Result.error("未找到对应数据");
}
return Result.OK(houseWarehouse);
}
/**
* 通过仓位查询
*
* @param positionid
* @return
*/
@AutoLog(value = "仓库列表-通过仓位查询")
@ApiOperation(value="仓库列表-通过仓位查询", notes="仓库列表-通过仓位查询")
@GetMapping(value = "/querypositionid")
public Result<?> querypositionid(@RequestParam(name="positionid",required=true) String positionid) {
List<HouseWarehouse> list = warehouseService.getBaseMapper().selectList(new QueryWrapper<HouseWarehouse>().eq("PositionId",positionid));
if(list==null) {
return Result.error("未找到对应数据");
}
return Result.OK(list);
}
/**
* 通过仓库查询仓位
*
* @param warehouseid
* @return
*/
@AutoLog(value = "仓库列表-通过仓库查询")
@ApiOperation(value="仓库列表-通过仓库查询", notes="仓库列表-通过仓库查询")
@GetMapping(value = "/querywarehouseid")
public Result<?> querywarehouseid(@RequestParam(name="warehouseId",required=true) String warehouseid) {
List<HouseWarehouse> list = warehouseService.getBaseMapper().selectList(new QueryWrapper<HouseWarehouse>().eq("WarehouseId",warehouseid));
if(list==null) {
return Result.error("未找到对应数据");
}
return Result.OK(list);
}
/**
* 导出excel
*
* @param request
* @param houseWarehouse
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HouseWarehouse houseWarehouse) {
return super.exportXls(request, houseWarehouse, HouseWarehouse.class, "仓库列表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, HouseWarehouse.class);
}
}
package org.jeecg.modules.iost.basedata.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.iost.basedata.entity.HouseRelocation;
import org.jeecg.modules.iost.basedata.entity.HouseWarehousing;
import org.jeecg.modules.iost.basedata.service.HouseIWarehousingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
/**
* @Description: 入库订单列表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
@Api(tags="入库订单列表")
@RestController
@RequestMapping("/basedata/warehousing")
@Slf4j
public class HouseWarehousingController extends JeecgController<HouseWarehousing, HouseIWarehousingService> {
@Autowired
private HouseIWarehousingService warehousingService;
/**
* 分页列表查询
*
* @param warehousing
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "入库订单列表-分页列表查询")
@ApiOperation(value="入库订单列表-分页列表查询", notes="入库订单列表-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(HouseWarehousing warehousing,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<HouseWarehousing> queryWrapper = QueryGenerator.initQueryWrapper(warehousing, req.getParameterMap());
Page<HouseWarehousing> page = new Page<HouseWarehousing>(pageNo, pageSize);
IPage<HouseWarehousing> pageList = warehousingService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 条件查询所有信息
*
* @param cangku
* @param cangwei
* @return
*/
@AutoLog(value = "入库订单列表-条件查询所有信息")
@ApiOperation(value="入库订单列表-条件查询所有信息", notes="入库订单列表-条件查询所有信息")
@PostMapping(value = "/seletlist")
public Result<?> seletlist(@RequestBody String cangku,@RequestBody String cangwei,@RequestBody String productcodeid,@RequestBody String productname) {
List<HouseWarehousing> list = warehousingService.selectlist(cangku,cangwei,productcodeid,productname);
return Result.OK(list);
}
/**
* 添加
*
* @param warehousing
* @return
*/
@AutoLog(value = "入库订单列表-添加")
@ApiOperation(value="入库订单列表-添加", notes="入库订单列表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody HouseWarehousing warehousing) {
warehousingService.save(warehousing);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param warehousing
* @return
*/
@AutoLog(value = "入库订单列表-编辑")
@ApiOperation(value="入库订单列表-编辑", notes="入库订单列表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody HouseWarehousing warehousing) {
warehousingService.updateById(warehousing);
return Result.OK("编辑成功!");
}
/**
* 移动产品数量
*
* @param warehousing
* @return
*/
@AutoLog(value = "入库订单列表-移动产品数量")
@ApiOperation(value="入库订单列表-移动产品数量", notes="入库订单列表-移动产品数量")
@PutMapping(value = "/updateshuliang")
public Result<?> updateshuliang(@RequestBody HouseWarehousing warehousing, @RequestBody HouseRelocation re) {
int shengyu = warehousing.getProductnumber()-re.getProductnumber();
warehousingService.updateById(warehousing);
if(shengyu!=0){
warehousing.setProductnumber(shengyu);
warehousingService.save(warehousing);
}
new HouseRelocationController().add(re);
return Result.OK("移动成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "入库订单列表-通过id删除")
@ApiOperation(value="入库订单列表-通过id删除", notes="入库订单列表-通过id删除")
@DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
warehousingService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "入库订单列表-批量删除")
@ApiOperation(value="入库订单列表-批量删除", notes="入库订单列表-批量删除")
@DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.warehousingService.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<?> queryById(@RequestParam(name="id",required=true) String id) {
HouseWarehousing warehousing = warehousingService.getById(id);
if(warehousing==null) {
return Result.error("未找到对应数据");
}
return Result.OK(warehousing);
}
/**
* 导出excel
*
* @param request
* @param warehousing
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, HouseWarehousing warehousing) {
return super.exportXls(request, warehousing, HouseWarehousing.class, "入库订单列表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, HouseWarehousing.class);
}
}
package org.jeecg.modules.iost.basedata.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 领取拣货单表
* @Author: jeecg-boot
* @Date: 2021-06-08
* @Version: V1.0
*/
@Data
@TableName("house_lingjianhuo")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="lingjianhuo对象", description="领取拣货单表")
public class HouseLingjianhuo implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@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;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**拣货单号*/
@Excel(name = "拣货单号", width = 15)
@ApiModelProperty(value = "拣货单号")
private String pickingid;
/**员工编号*/
@Excel(name = "员工编号", width = 15)
@ApiModelProperty(value = "员工编号")
private String yuanggongbianhao;
/**员工名称*/
@Excel(name = "员工名称", width = 15)
@ApiModelProperty(value = "员工名称")
private String yuangongname;
/**扫描时间*/
@Excel(name = "扫描时间", width = 15)
@ApiModelProperty(value = "扫描时间")
private String saomiaodata;
}
package org.jeecg.modules.iost.basedata.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 拣货单表
* @Author: jeecg-boot
* @Date: 2021-06-08
* @Version: V1.0
*/
@Data
@TableName("house_pickingtable")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="pickingtable对象", description="拣货单表")
public class HousePickingtable implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@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;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**销售单号*/
@Excel(name = "销售单号", width = 15)
@ApiModelProperty(value = "销售单号")
private String saleid;
/**领单时间*/
@Excel(name = "领单时间", width = 15)
@ApiModelProperty(value = "领单时间")
private String lindandata;
/**拣货员*/
@Excel(name = "拣货员", width = 15)
@ApiModelProperty(value = "拣货员")
private String yuanggongid;
/**扫描完成时间*/
@Excel(name = "扫描完成时间", width = 15)
@ApiModelProperty(value = "扫描完成时间")
private String wanchengdata;
/**需求数量*/
@Excel(name = "需求数量", width = 15)
@ApiModelProperty(value = "需求数量")
private String demandnumber;
/**0=拣货中,1=已拣货*/
@Excel(name = "0=拣货中,1=已拣货", width = 15)
@ApiModelProperty(value = "0=拣货中,1=已拣货")
private String zhuangtai;
}
package org.jeecg.modules.iost.basedata.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 采购产品订单表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
@Data
@TableName("house_product")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="product对象", description="采购产品订单表")
public class HouseProduct implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@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;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**采购顶单号*/
@Excel(name = "采购顶单号", width = 15)
@ApiModelProperty(value = "采购顶单号")
private Integer purchaseid;
/**产品编码*/
@Excel(name = "产品编码", width = 15)
@ApiModelProperty(value = "产品编码")
private String productcodeid;
/**产品名称*/
@Excel(name = "产品名称", width = 15)
@ApiModelProperty(value = "产品名称")
private String productname;
/**数量*/
@Excel(name = "数量", width = 15)
@ApiModelProperty(value = "数量")
private Integer productnumber;
/**功效*/
@Excel(name = "功效", width = 15)
@ApiModelProperty(value = "功效")
private String productnotes;
}
package org.jeecg.modules.iost.basedata.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 移库记录表
* @Author: jeecg-boot
* @Date: 2021-06-07
* @Version: V1.0
*/
@Data
@TableName("house_relocation")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="relocation对象", description="移库记录表")
public class HouseRelocation implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@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;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**产品编码*/
@Excel(name = "产品编码", width = 15)
@ApiModelProperty(value = "产品编码")
private String productcodeid;
/**产品名称*/
@Excel(name = "产品名称", width = 15)
@ApiModelProperty(value = "产品名称")
private String productname;
/**移出数量*/
@Excel(name = "移出数量", width = 15)
@ApiModelProperty(value = "移出数量")
private Integer productnumber;
/**移出仓库*/
@Excel(name = "移出仓库", width = 15)
@ApiModelProperty(value = "移出仓库")
private String productremove;
/**移出仓位*/
@Excel(name = "移出仓位", width = 15)
@ApiModelProperty(value = "移出仓位")
private String positionremove;
/**移入仓库*/
@Excel(name = "移入仓库", width = 15)
@ApiModelProperty(value = "移入仓库")
private String productmove;
/**移入仓位*/
@Excel(name = "移入仓位", width = 15)
@ApiModelProperty(value = "移入仓位")
private String positionmove;
/**员工编号*/
@Excel(name = "员工编号", width = 15)
@ApiModelProperty(value = "员工编号")
private Integer yuangongbianhao;
/**员工姓名*/
@Excel(name = "员工姓名", width = 15)
@ApiModelProperty(value = "员工姓名")
private String yuangongname;
}
package org.jeecg.modules.iost.basedata.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 仓库列表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
@Data
@TableName("house_warehouse")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="warehouse对象", description="仓库列表")
public class HouseWarehouse implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@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;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**仓库*/
@Excel(name = "仓库", width = 15)
@ApiModelProperty(value = "仓库")
private String warehouseid;
/**仓位*/
@Excel(name = "仓位", width = 15)
@ApiModelProperty(value = "仓位")
private String positionid;
}
package org.jeecg.modules.iost.basedata.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 入库订单列表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
@Data
@TableName("house_warehousing")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="warehousing对象", description="入库订单列表")
public class HouseWarehousing implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@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;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**入库订单编号*/
@Excel(name = "入库订单编号", width = 15)
@ApiModelProperty(value = "入库订单编号")
private Integer warehousingid;
/**仓库*/
@Excel(name = "仓库", width = 15)
@ApiModelProperty(value = "仓库")
private String warehouseid;
/**仓位*/
@Excel(name = "仓位", width = 15)
@ApiModelProperty(value = "仓位")
private String positionid;
/**产品编码*/
@Excel(name = "产品编码", width = 15)
@ApiModelProperty(value = "产品编码")
private String productcodeid;
/**产品名称*/
@Excel(name = "产品名称", width = 15)
@ApiModelProperty(value = "产品名称")
private String productname;
/**数量*/
@Excel(name = "数量", width = 15)
@ApiModelProperty(value = "数量")
private Integer productnumber;
/**功效*/
@Excel(name = "功效", width = 15)
@ApiModelProperty(value = "功效")
private String productnotes;
}
package org.jeecg.modules.iost.basedata.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.iost.basedata.entity.HouseLingjianhuo;
/**
* @Description: 领取拣货单表
* @Author: jeecg-boot
* @Date: 2021-06-08
* @Version: V1.0
*/
public interface HouseLingjianhuoMapper extends BaseMapper<HouseLingjianhuo> {
}
package org.jeecg.modules.iost.basedata.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.iost.basedata.entity.HousePickingtable;
/**
* @Description: 拣货单表
* @Author: jeecg-boot
* @Date: 2021-06-08
* @Version: V1.0
*/
public interface HousePickingtableMapper extends BaseMapper<HousePickingtable> {
}
package org.jeecg.modules.iost.basedata.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.iost.basedata.entity.HouseProduct;
/**
* @Description: 采购产品订单表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
public interface HouseProductMapper extends BaseMapper<HouseProduct> {
}
package org.jeecg.modules.iost.basedata.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.iost.basedata.entity.HouseRelocation;
/**
* @Description: 移库记录表
* @Author: jeecg-boot
* @Date: 2021-06-07
* @Version: V1.0
*/
public interface HouseRelocationMapper extends BaseMapper<HouseRelocation> {
}
package org.jeecg.modules.iost.basedata.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.iost.basedata.entity.HouseWarehouse;
/**
* @Description: 仓库列表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
public interface HouseWarehouseMapper extends BaseMapper<HouseWarehouse> {
}
package org.jeecg.modules.iost.basedata.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.iost.basedata.entity.HouseWarehousing;
import java.util.List;
/**
* @Description: 入库订单列表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
public interface HouseWarehousingMapper extends BaseMapper<HouseWarehousing> {
public List<HouseWarehousing> selectlist(@Param("cangku") String cangku, @Param("cangwei") String cangwei, @Param("productcodeid") String productcodeid, @Param("productname") String productname);
}
<?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.inandoutofstorage.basedata.mapper.LingjianhuoMapper">
</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.inandoutofstorage.basedata.mapper.PickingtableMapper">
</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.inandoutofstorage.basedata.mapper.ProductMapper">
</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.inandoutofstorage.basedata.mapper.RelocationMapper">
</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.inandoutofstorage.basedata.mapper.WarehouseMapper">
</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.inandoutofstorage.basedata.mapper.WarehousingMapper">
<select id="selectlist" parameterType="java.lang.String" resultType="org.jeecg.modules.iost.basedata.entity.HouseWarehousing">
SELECT *
FROM warehousing
<where>
<if test="cangku != null">
and WarehouseId = #{cangku}
</if>
<if test="cangwei != null">
and PositionId = #{cangwei}
</if>
<if test="productcodeid != null">
and ProductcodeId = #{productcodeid}
</if>
<if test="productname != null">
and Productname = #{productname}
</if>
</where>
ORDER BY WarehouseId</select>
</mapper>
\ No newline at end of file
package org.jeecg.modules.iost.basedata.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.iost.basedata.entity.HouseLingjianhuo;
/**
* @Description: 领取拣货单表
* @Author: jeecg-boot
* @Date: 2021-06-08
* @Version: V1.0
*/
public interface HouseILingjianhuoService extends IService<HouseLingjianhuo> {
}
package org.jeecg.modules.iost.basedata.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.iost.basedata.entity.HousePickingtable;
/**
* @Description: 拣货单表
* @Author: jeecg-boot
* @Date: 2021-06-08
* @Version: V1.0
*/
public interface HouseIPickingtableService extends IService<HousePickingtable> {
}
package org.jeecg.modules.iost.basedata.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.iost.basedata.entity.HouseProduct;
/**
* @Description: 采购产品订单表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
public interface HouseIProductService extends IService<HouseProduct> {
}
package org.jeecg.modules.iost.basedata.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.iost.basedata.entity.HouseRelocation;
/**
* @Description: 移库记录表
* @Author: jeecg-boot
* @Date: 2021-06-07
* @Version: V1.0
*/
public interface HouseIRelocationService extends IService<HouseRelocation> {
}
package org.jeecg.modules.iost.basedata.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.iost.basedata.entity.HouseWarehouse;
/**
* @Description: 仓库列表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
public interface HouseIWarehouseService extends IService<HouseWarehouse> {
}
package org.jeecg.modules.iost.basedata.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.iost.basedata.entity.HouseWarehousing;
import java.util.List;
/**
* @Description: 入库订单列表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
public interface HouseIWarehousingService extends IService<HouseWarehousing> {
public List<HouseWarehousing> selectlist(String cangku, String cangwei, String productcodeid, String productname);
}
package org.jeecg.modules.iost.basedata.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.iost.basedata.entity.HouseLingjianhuo;
import org.jeecg.modules.iost.basedata.mapper.HouseLingjianhuoMapper;
import org.jeecg.modules.iost.basedata.service.HouseILingjianhuoService;
import org.springframework.stereotype.Service;
/**
* @Description: 领取拣货单表
* @Author: jeecg-boot
* @Date: 2021-06-08
* @Version: V1.0
*/
@Service
public class HouseLingjianhuoServiceImpl extends ServiceImpl<HouseLingjianhuoMapper, HouseLingjianhuo> implements HouseILingjianhuoService {
}
package org.jeecg.modules.iost.basedata.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.iost.basedata.entity.HousePickingtable;
import org.jeecg.modules.iost.basedata.mapper.HousePickingtableMapper;
import org.jeecg.modules.iost.basedata.service.HouseIPickingtableService;
import org.springframework.stereotype.Service;
/**
* @Description: 拣货单表
* @Author: jeecg-boot
* @Date: 2021-06-08
* @Version: V1.0
*/
@Service
public class HousePickingtableServiceImpl extends ServiceImpl<HousePickingtableMapper, HousePickingtable> implements HouseIPickingtableService {
}
package org.jeecg.modules.iost.basedata.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.iost.basedata.entity.HouseProduct;
import org.jeecg.modules.iost.basedata.mapper.HouseProductMapper;
import org.jeecg.modules.iost.basedata.service.HouseIProductService;
import org.springframework.stereotype.Service;
/**
* @Description: 采购产品订单表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
@Service
public class HouseProductServiceImpl extends ServiceImpl<HouseProductMapper, HouseProduct> implements HouseIProductService {
}
package org.jeecg.modules.iost.basedata.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.iost.basedata.entity.HouseRelocation;
import org.jeecg.modules.iost.basedata.mapper.HouseRelocationMapper;
import org.jeecg.modules.iost.basedata.service.HouseIRelocationService;
import org.springframework.stereotype.Service;
/**
* @Description: 移库记录表
* @Author: jeecg-boot
* @Date: 2021-06-07
* @Version: V1.0
*/
@Service
public class HouseRelocationServiceImpl extends ServiceImpl<HouseRelocationMapper, HouseRelocation> implements HouseIRelocationService {
}
package org.jeecg.modules.iost.basedata.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.iost.basedata.entity.HouseWarehouse;
import org.jeecg.modules.iost.basedata.mapper.HouseWarehouseMapper;
import org.jeecg.modules.iost.basedata.service.HouseIWarehouseService;
import org.springframework.stereotype.Service;
/**
* @Description: 仓库表
* @Author: jeecg-boot
* @Date: 2021-06-07
* @Version: V1.0
*/
@Service
public class HouseWarehouseServieceImp extends ServiceImpl<HouseWarehouseMapper, HouseWarehouse> implements HouseIWarehouseService {
}
package org.jeecg.modules.iost.basedata.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.iost.basedata.entity.HouseWarehousing;
import org.jeecg.modules.iost.basedata.mapper.HouseWarehousingMapper;
import org.jeecg.modules.iost.basedata.service.HouseIWarehousingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* @Description: 入库订单列表
* @Author: jeecg-boot
* @Date: 2021-06-04
* @Version: V1.0
*/
@Service
public class HouseWarehousingServiceImpl extends ServiceImpl<HouseWarehousingMapper, HouseWarehousing> implements HouseIWarehousingService {
@Autowired
HouseIWarehousingService houseIWarehousingService;
@Override
public List<HouseWarehousing> selectlist(String cangku, String cangwei, String productcodeid, String productname) {
return houseIWarehousingService.selectlist(cangku,cangwei,productcodeid,productname);
}
}
...@@ -3,7 +3,7 @@ server: ...@@ -3,7 +3,7 @@ server:
tomcat: tomcat:
max-swallow-size: -1 max-swallow-size: -1
servlet: servlet:
context-path: /jeecg-boot context-path: /wmssystem
compression: compression:
enabled: true enabled: true
min-response-size: 1024 min-response-size: 1024
...@@ -127,20 +127,20 @@ spring: ...@@ -127,20 +127,20 @@ spring:
connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
datasource: datasource:
master: master:
url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai url: jdbc:mysql://127.0.0.1:3306/wmssystem?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root username: root
password: root password: root
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
# 多数据源配置 # 多数据源配置
#multi-datasource1: #multi-datasource1:
#url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai # url: jdbc:mysql://localhost:3306/ceshi2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
#username: root #username: root
#password: root #password: root
#driver-class-name: com.mysql.cj.jdbc.Driver #driver-class-name: com.mysql.cj.jdbc.Driver
#redis 配置 #redis 配置
redis: redis:
database: 0 database: 0
host: 192.168.1.199 host: 127.0.0.1
lettuce: lettuce:
pool: pool:
max-active: 8 #最大连接数据库连接数,设 0 为没有限制 max-active: 8 #最大连接数据库连接数,设 0 为没有限制
......
spring: spring:
profiles: profiles:
active: docker active: test
swagger: swagger:
production: false production: false
basic: basic:
......
#mysql #mysql
#diver_name=com.mysql.cj.jdbc.Driver
#url=jdbc:mysql://wmssystem-mysql:3306/wmssystem?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai
#username=root
#password=gf^*i6%&9J83&(*kJ653F&L
#database_name=wmssystem
#mysql
diver_name=com.mysql.cj.jdbc.Driver diver_name=com.mysql.cj.jdbc.Driver
url=jdbc:mysql://wmssystem-mysql:3306/wmssystem?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai url=jdbc:mysql://localhost:3306/ceshi2?useUnicode=true&amp;characterEncodeing=UTF-8&amp;useSSL=false&amp;serverTimezone=GMT
username=root username=root
password=gf^*i6%&9J83&(*kJ653F&L password=accp
database_name=wmssystem
#oracle #oracle
#diver_name=oracle.jdbc.driver.OracleDriver #diver_name=oracle.jdbc.driver.OracleDriver
......
package org.jeecg; package org.jeecg;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.security.SecurityTools; import org.jeecg.common.util.security.SecurityTools;
import org.jeecg.common.util.security.entity.*; import org.jeecg.common.util.security.entity.*;
import org.jeecg.modules.iost.basedata.entity.HouseWarehouse;
import org.jeecg.modules.iost.basedata.service.HouseIWarehouseService;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
public class SecurityToolsTest { public class SecurityToolsTest {
@Autowired
private HouseIWarehouseService warehouseService ;
@Test @Test
public void Test(){ public void Test(){
MyKeyPair mkeyPair = SecurityTools.generateKeyPair(); MyKeyPair mkeyPair = SecurityTools.generateKeyPair();
...@@ -46,4 +54,15 @@ public class SecurityToolsTest { ...@@ -46,4 +54,15 @@ public class SecurityToolsTest {
//sucess 为验签成功失败标志 true代码验签成功,false代表失败 //sucess 为验签成功失败标志 true代码验签成功,false代表失败
System.out.println(new JSONObject(securityResp).toStringPretty()); System.out.println(new JSONObject(securityResp).toStringPretty());
} }
@AutoLog(value = "仓库列表-通过仓位查询")
@ApiOperation(value="仓库列表-通过仓位查询", notes="仓库列表-通过仓位查询")
@GetMapping(value = "/querypositionid")
@Test
public void querypositionid() {
HouseWarehouse houseWarehouse = warehouseService.getBaseMapper().selectById(1);//new QueryWrapper<Warehouse>().like("PositionId","A001"));
if(houseWarehouse ==null) {
//return Result.error("未找到对应数据");
}
//return Result.OK(warehouse);
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论