Merge remote-tracking branch 'origin/dev' into dev

pro
schry 2 years ago
commit c669d89eb4

@ -214,6 +214,7 @@ public class ConstantStatus {
public static final int FROM_THRORDER = 14; //第三方单据转单
public static final int FROM_Order = 15; //采购计划转单
public static final int FROM_BACK = 17; //出库转退货单;
public static final int FROM_Muti = 18; //多次出入库单;
//DI类型

@ -178,8 +178,6 @@ public class BasicBussinessTypeController extends BaseController {
@GetMapping("/udiwms/localBusType/filterJoinByUser")
public BaseResponse filterJoinByUser(FilterBussinessTypeRequest bussinessTypeFilterRequest,
BindingResult bindingResult) {
if (StrUtil.isNotEmpty(bussinessTypeFilterRequest.getVueType())) {
List<BasicBussinessTypeEntity> result = new ArrayList<>();
List<BasicBussinessTypeEntity> bussinessTypeEntities = basicBussinessTypeService.findByVueType(bussinessTypeFilterRequest.getVueType());

@ -514,5 +514,13 @@ public class BasicCorpController {
return ResultVOUtils.success(getCorpList);
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/basic/unit/maintain/selectCorpList")
public BaseResponse selectCorpList(@RequestBody BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) {
List<BasicCorpEntity> getCorpList = basicUnitMaintainService.selectCorpList(basicUnitMaintainFilterRequest);
return ResultVOUtils.success(getCorpList);
}
}

@ -81,19 +81,15 @@ public class IoOrderController extends BaseController {
@AuthRuleAnnotation("")
@GetMapping("/udiwms/inout/order/filter")
public BaseResponse filterOrder(FilterOrderRequest filterOrderRequest) {
if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
orderService.setFilterStatus(filterOrderRequest);
}
if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
orderService.setActions(filterOrderRequest);
}
if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {
orderService.setInvoiceFiltes(filterOrderRequest);
}
if (filterOrderRequest.getSourceLocalType() != null) {
if (filterOrderRequest.getSourceLocalType() == 1) {
filterOrderRequest.setSourceTypes(Arrays.asList(1, 2, 3, 4, 5));

@ -0,0 +1,379 @@
package com.glxp.api.controller.inout;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.InvWarehouseEntity;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.inout.*;
import com.glxp.api.req.inout.IoOrderMutiRequest;
import com.glxp.api.res.inout.IoOrderMutiResponse;
import com.glxp.api.res.inout.IoOrderMutiSetResponse;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.basic.IBasicBussinessTypeService;
import com.glxp.api.service.basic.UdiProductService;
import com.glxp.api.service.inout.*;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import com.glxp.api.util.RedisUtil;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
@RestController
public class IoOrderMutiController {
@Resource
private IoOrderMutiService ioOrderMutiService;
@Resource
private UdiProductService udiProductService;
@Resource
private IoOrderMutiUseService ioOrderMutiUseService;
@Resource
private IoOrderMutiSetService ioOrderMutiSetService;
@Resource
RedisUtil redisUtil;
@Resource
CustomerService customerService;
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource
private IoOrderService orderService;
@Resource
IoCodeTempService codeTempService;
@Resource
IBasicBussinessTypeService basicBussinessTypeService;
@Resource
InvWarehouseService invWarehouseService;
@PostMapping("/udiwms/inout/order/muti/checkUdi")
public BaseResponse checkUdi(@RequestBody IoOrderMutiEntity ioOrderMutiEntity) {
if (StrUtil.isNotBlank(ioOrderMutiEntity.getUdiCode())) {
//查询码是否包含序列号
UdiEntity udiEntity = FilterUdiUtils.getUdi(ioOrderMutiEntity.getUdiCode());
if (StrUtil.isNotBlank(udiEntity.getSerialNo())) {
//包含
QueryWrapper<IoOrderMutiEntity> ew = new QueryWrapper<>();
ew.eq("udiCode", ioOrderMutiEntity.getUdiCode());
IoOrderMutiEntity ioOrderMutiEntityOne = ioOrderMutiService.getOne(ew);
//查询是否被使用过
if (ioOrderMutiEntityOne != null) {
if (ioOrderMutiEntityOne.getReCount() == 0) {
return ResultVOUtils.error(999, "该产品库存不足!");
}
return ResultVOUtils.success(ioOrderMutiEntityOne.getId());
} else {
//查询物资信息
UdiProductEntity udiProductEntity = udiProductService.selectUdiByName(udiEntity.getUdi());
ioOrderMutiEntityOne = new IoOrderMutiEntity();
ioOrderMutiEntityOne.setId(IdUtil.getSnowflakeNextId());
ioOrderMutiEntityOne.setRelIdFk(udiProductEntity.getRelId());
ioOrderMutiEntityOne.setMark(ioOrderMutiEntity.getMark());
ioOrderMutiEntityOne.setUdiCode(ioOrderMutiEntity.getUdiCode());
ioOrderMutiEntityOne.setBatchNo(udiEntity.getBatchNo());
ioOrderMutiEntityOne.setExpireDate(udiEntity.getExpireDate());
ioOrderMutiEntityOne.setProduceDate(udiEntity.getProduceDate());
ioOrderMutiEntityOne.setTotalCount(20);
ioOrderMutiEntityOne.setStatus(0);
ioOrderMutiEntityOne.setCreateUser(customerService.getUserId() + "");
ioOrderMutiEntityOne.setUseCount(0);
ioOrderMutiEntityOne.setReCount(20);
ioOrderMutiEntityOne.setCreateTime(new Date());
ioOrderMutiEntityOne.setUpdateTime(new Date());
ioOrderMutiEntityOne.setNameCode(udiProductEntity.getNameCode());
ioOrderMutiEntityOne.setSerialNo(udiEntity.getSerialNo());
ioOrderMutiEntityOne.setSupId(udiProductEntity.getSupId());
ioOrderMutiService.save(ioOrderMutiEntityOne);
return ResultVOUtils.success(ioOrderMutiEntityOne.getId());
}
} else {
//不包含
return ResultVOUtils.error(888, "");
}
} else {
return ResultVOUtils.error(999, "请选填写UDI码");
}
}
@GetMapping("/udiwms/inout/order/muti/filterMutiList")
public BaseResponse filterMutiList(IoOrderMutiEntity ioOrderMutiEntity) {
ioOrderMutiEntity = ioOrderMutiService.getById(ioOrderMutiEntity.getId());
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(ioOrderMutiEntity.getNameCode());
IoOrderMutiResponse ioOrderMutiResponse = new IoOrderMutiResponse();
BeanUtils.copyProperties(ioOrderMutiEntity, ioOrderMutiResponse);
ioOrderMutiResponse.setCpmctymc(udiProductEntity.getCpmctymc());
ioOrderMutiResponse.setGgxh(udiProductEntity.getGgxh());
QueryWrapper<IoOrderMutiUseEntity> ew = new QueryWrapper<>();
ew.eq("mutiIdFk", ioOrderMutiEntity.getId());
ew.select("io_order_muti_use.*,(SELECT userName FROM auth_user WHERE auth_user.id=io_order_muti_use.useUser) as createUserName");
List<IoOrderMutiUseEntity> ioOrderMutiUseEntityList = ioOrderMutiUseService.list(ew);
Map<String, Object> map = new HashMap<>();
map.put("data", ioOrderMutiResponse);
map.put("detailList", ioOrderMutiUseEntityList);
return ResultVOUtils.success(map);
}
@PostMapping("/udiwms/inout/order/muti/addOrderMuti")
public BaseResponse addOrderMuti(@RequestBody IoOrderMutiEntity ioOrderMutiEntity) {
if (StrUtil.isNotBlank(ioOrderMutiEntity.getUdiCode())) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(ioOrderMutiEntity.getUdiCode());
//查询物资信息
UdiProductEntity udiProductEntity = udiProductService.selectUdiByName(udiEntity.getUdi());
IoOrderMutiEntity ioOrderMutiEntity1 = new IoOrderMutiEntity();
ioOrderMutiEntity1.setId(IdUtil.getSnowflakeNextId());
ioOrderMutiEntity1.setRelIdFk(udiProductEntity.getRelId());
ioOrderMutiEntity1.setMark(ioOrderMutiEntity.getMark());
ioOrderMutiEntity1.setUdiCode(ioOrderMutiEntity.getUdiCode());
ioOrderMutiEntity1.setBatchNo(udiEntity.getBatchNo());
ioOrderMutiEntity1.setExpireDate(udiEntity.getExpireDate());
ioOrderMutiEntity1.setProduceDate(udiEntity.getProduceDate());
ioOrderMutiEntity1.setTotalCount(20);
ioOrderMutiEntity1.setStatus(0);
ioOrderMutiEntity1.setUseCount(0);
ioOrderMutiEntity1.setReCount(20);
ioOrderMutiEntity1.setCreateUser(customerService.getUserId() + "");
ioOrderMutiEntity1.setCreateTime(new Date());
ioOrderMutiEntity1.setUpdateTime(new Date());
ioOrderMutiEntity1.setNameCode(udiProductEntity.getNameCode());
ioOrderMutiEntity1.setSerialNo(udiEntity.getSerialNo());
ioOrderMutiEntity1.setSupId(udiProductEntity.getSupId());
ioOrderMutiService.save(ioOrderMutiEntity1);
return ResultVOUtils.success(ioOrderMutiEntity1.getId());
} else {
return ResultVOUtils.error(999, "请选填写UDI码");
}
}
@PostMapping("/udiwms/inout/order/muti/updateOrderMuti")
public BaseResponse updateOrderMuti(@RequestBody IoOrderMutiEntity ioOrderMutiEntity) {
String orderNo =ioOrderMutiEntity.getOrderIdFk();
//如果是第一次的话就插入
String mark=ioOrderMutiEntity.getMark();
int totalCount=ioOrderMutiEntity.getTotalCount();
int useCount=ioOrderMutiEntity.getUseCount();
int status=ioOrderMutiEntity.getStatus();
ioOrderMutiEntity= ioOrderMutiService.getById(ioOrderMutiEntity.getId());
ioOrderMutiEntity.setMark(mark);
ioOrderMutiEntity.setTotalCount(totalCount);
ioOrderMutiEntity.setUseCount(useCount);
ioOrderMutiEntity.setStatus(status);
if (StrUtil.isBlank(ioOrderMutiEntity.getOrderIdFk())) {
IoOrderEntity orderEntity = new IoOrderEntity();
//查询补单条件
AuthAdmin authAdmin = customerService.getUserBean();
QueryWrapper<IoOrderMutiSetEntity> setEw = new QueryWrapper<>();
setEw.eq("curInv", authAdmin.getLocInvCode());
IoOrderMutiSetEntity ioOrderMutiSetEntity = ioOrderMutiSetService.getOne(setEw);
if (ioOrderMutiSetEntity == null) {
return ResultVOUtils.error(999, "请设置补单条件!");
}
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(ioOrderMutiSetEntity.getTargetAction());
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(ioOrderMutiSetEntity.getCurInv());
orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
orderEntity.setBillNo(orderNo);
orderEntity.setMainAction(ConstantType.TYPE_OUT);
orderEntity.setCreateUser(authAdmin.getId() + "");
orderEntity.setCreateTime(new Date());
orderEntity.setUpdateUser(authAdmin.getId() + "");
orderEntity.setUpdateTime(new Date());
orderEntity.setCustomerId(authAdmin.getCustomerId() + "");
orderEntity.setFromCorp(ioOrderMutiSetEntity.getFromCorp());
orderEntity.setAction(bussinessTypeEntity.getAction());
orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
orderEntity.setDeptCode(invWarehouseEntity.getParentId());
orderEntity.setInvCode(invWarehouseEntity.getCode());
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);
orderEntity.setFromType(ConstantStatus.FROM_Muti);
orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_NORMAL);
orderEntity.setBusType(bussinessTypeEntity.getBusType());
//插入单据
orderService.insertOrder(orderEntity);
IoCodeTempEntity ioCodeTempEntity = new IoCodeTempEntity();
ioCodeTempEntity.setCode(ioOrderMutiEntity.getUdiCode());
ioCodeTempEntity.setMainAction(ConstantType.TYPE_OUT);
ioCodeTempEntity.setAction(bussinessTypeEntity.getAction());
ioCodeTempEntity.setOrderId(orderNo);
ioCodeTempEntity.setNameCode(ioOrderMutiEntity.getNameCode());
ioCodeTempEntity.setBatchNo(ioOrderMutiEntity.getBatchNo());
ioCodeTempEntity.setProduceDate(ioOrderMutiEntity.getProduceDate());
ioCodeTempEntity.setExpireDate(ioOrderMutiEntity.getExpireDate());
ioCodeTempEntity.setSerialNo(ioOrderMutiEntity.getSerialNo());
ioCodeTempEntity.setSupId(ioOrderMutiEntity.getSupId());
ioCodeTempEntity.setRelId(Long.valueOf(ioOrderMutiEntity.getRelIdFk()));
ioCodeTempEntity.setCount(ioOrderMutiEntity.getTotalCount());
ioCodeTempEntity.setReCount(ioOrderMutiEntity.getTotalCount() - ioOrderMutiEntity.getUseCount());
ioCodeTempEntity.setCreateTime(new Date());
ioCodeTempEntity.setUpdateTime(new Date());
ioCodeTempEntity.setDeptCode(invWarehouseEntity.getParentId());
ioCodeTempEntity.setInvCode(invWarehouseEntity.getCode());
codeTempService.insert(ioCodeTempEntity);
}
ioOrderMutiEntity.setReCount(ioOrderMutiEntity.getTotalCount() - ioOrderMutiEntity.getUseCount());
ioOrderMutiEntity.setOrderIdFk(orderNo);
ioOrderMutiEntity.setCreateTime(new Date());
ioOrderMutiEntity.setCreateUser(customerService.getUserId() + "");
ioOrderMutiEntity.setUpdateTime(new Date());
ioOrderMutiEntity.setUpdateUser(customerService.getUserId() + "");
boolean falg = ioOrderMutiService.updateById(ioOrderMutiEntity);
QueryWrapper<IoOrderMutiUseEntity> ew = new QueryWrapper<>();
ew.eq("mutiIdFk", ioOrderMutiEntity.getId());
List<IoOrderMutiUseEntity> ioOrderMutiUseEntityList = ioOrderMutiUseService.list(ew);
for (IoOrderMutiUseEntity ioOrderMutiUseEntity : ioOrderMutiUseEntityList) {
ioOrderMutiUseEntity.setStatus(1);
}
ioOrderMutiUseService.updateBatchById(ioOrderMutiUseEntityList);
if (falg) {
return ResultVOUtils.success();
} else {
return ResultVOUtils.error(999, "更新失败");
}
}
@PostMapping("/udiwms/inout/order/muti/filterMutiDetailList")
public BaseResponse filterMutiDetailList(@RequestBody IoOrderMutiRequest ioOrderMutiRequest) {
//判断是不是个人使用
AuthAdmin authAdmin = customerService.getUserBean();
QueryWrapper<IoOrderMutiSetEntity> setEw=new QueryWrapper<>();
setEw.eq("curInv",authAdmin.getLocInvCode());
IoOrderMutiSetEntity ioOrderMutiSetEntity=ioOrderMutiSetService.getOne(setEw);
if(ioOrderMutiSetEntity!=null){
if(ioOrderMutiSetEntity.getCheckUse()==1){
ioOrderMutiRequest.setCreateUser(authAdmin.getId()+"");
}
}else{
return ResultVOUtils.error(999,"请先设置多次出库单据类型!");
}
ioOrderMutiRequest.setStatus(0);
List<IoOrderMutiResponse> ioOrderMutiEntityList = ioOrderMutiService.filterList(ioOrderMutiRequest);
return ResultVOUtils.success(ioOrderMutiEntityList);
}
@PostMapping("/udiwms/inout/order/muti/selectMutiDetailList")
public BaseResponse selectMutiDetailList(@RequestBody IoOrderMutiUseEntity ioOrderMutiUseEntity) {
QueryWrapper<IoOrderMutiUseEntity> ew = new QueryWrapper<>();
ew.eq("mutiIdFk", ioOrderMutiUseEntity.getMutiIdFk());
ew.select("io_order_muti_use.*,(SELECT userName FROM auth_user WHERE auth_user.id=io_order_muti_use.useUser) as createUserName");
List<IoOrderMutiUseEntity> ioOrderMutiEntityList = ioOrderMutiUseService.list(ew);
return ResultVOUtils.success(ioOrderMutiEntityList);
}
@PostMapping("/udiwms/inout/order/muti/selectMutiList")
public BaseResponse selectMutiList(@RequestBody IoOrderMutiRequest ioOrderMutiRequest) {
List<IoOrderMutiResponse> list = ioOrderMutiService.filterList(ioOrderMutiRequest);
PageInfo<IoOrderMutiResponse> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
}
@PostMapping("/udiwms/inout/order/muti/addMutiDetail")
public BaseResponse addMutiDetail(@RequestBody IoOrderMutiUseEntity ioOrderMutiUseEntity) {
//判断是不是个人使用
AuthAdmin authAdmin = customerService.getUserBean();
QueryWrapper<IoOrderMutiSetEntity> setEw=new QueryWrapper<>();
setEw.eq("curInv",authAdmin.getLocInvCode());
IoOrderMutiSetEntity ioOrderMutiSetEntity=ioOrderMutiSetService.getOne(setEw);
if(ioOrderMutiSetEntity!=null){
if(ioOrderMutiSetEntity.getCheckUse()==1){
IoOrderMutiEntity ioOrderMutiEntity=ioOrderMutiService.getById(ioOrderMutiUseEntity.getMutiIdFk());
if(!ioOrderMutiEntity.getCreateUser().equals(authAdmin.getId()+"")){
return ResultVOUtils.error(999,"该单设置了个人使用,添加失败!");
}
}
}else{
return ResultVOUtils.error(999,"请先设置多次出库单据类型!");
}
int sum = 0;
QueryWrapper<IoOrderMutiUseEntity> ew = new QueryWrapper<>();
ew.eq("mutiIdFk", ioOrderMutiUseEntity.getMutiIdFk());
Long count = ioOrderMutiUseService.count(ew);
if (count == null) {
sum = 0;
} else {
sum = count.intValue();
}
IoOrderMutiEntity ioOrderMutiEntity = ioOrderMutiService.getById(ioOrderMutiUseEntity.getMutiIdFk());
if (ioOrderMutiEntity.getTotalCount() - count == 0) {
return ResultVOUtils.error(999, "该产品数量不足!");
}
ioOrderMutiUseEntity.setId(IdUtil.getSnowflakeNextId());
ioOrderMutiUseEntity.setCurIndex(sum + 1);
ioOrderMutiUseEntity.setUseUser(customerService.getUserId() + "");
ioOrderMutiUseEntity.setUseTime(new Date());
ioOrderMutiUseService.save(ioOrderMutiUseEntity);
return ResultVOUtils.success();
}
@GetMapping("/udiwms/inout/order/muti/getMark")
public BaseResponse getMark() {
String recordId = gennerOrderUtils.createOrderMark(new OrderNoTypeBean("yyMMdd"));
return ResultVOUtils.success(recordId);
}
@PostMapping("/udiwms/inout/order/muti/delectMutiDelect")
public BaseResponse delectMutiDelect(@RequestBody IoOrderMutiUseEntity ioOrderMutiUseEntity) {
ioOrderMutiUseService.removeById(ioOrderMutiUseEntity);
return ResultVOUtils.success();
}
@PostMapping("/udiwms/inout/order/muti/delectMuti")
public BaseResponse delectMuti(@RequestBody IoOrderMutiEntity ioOrderMutiEntity) {
Boolean falg = ioOrderMutiService.removeById(ioOrderMutiEntity);
if (falg) {
return ResultVOUtils.success();
} else {
return ResultVOUtils.error(999, "删除失败");
}
}
@PostMapping("/udiwms/inout/order/muti/auditMuti")
public BaseResponse auditMuti(@RequestBody IoOrderMutiEntity ioOrderMutiEntity) {
ioOrderMutiEntity.setUpdateTime(new Date());
ioOrderMutiEntity.setUpdateUser(customerService.getUserId()+"");
ioOrderMutiEntity.setAuditTime(new Date());
ioOrderMutiEntity.setAuditUser(customerService.getUserId()+"");
ioOrderMutiService.updateById(ioOrderMutiEntity);
return ResultVOUtils.success();
}
}

@ -0,0 +1,88 @@
package com.glxp.api.controller.inout;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageInfo;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.inout.IoOrderMutiSetEntity;
import com.glxp.api.req.inout.FilterCodeRequest;
import com.glxp.api.req.inout.IoOrderMutiSetRequest;
import com.glxp.api.res.inout.IoCodeResponse;
import com.glxp.api.res.inout.IoOrderMutiSetResponse;
import com.glxp.api.service.inout.IoOrderMutiSetService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@RestController
public class IoOrderMutiSetController {
@Resource
private IoOrderMutiSetService ioOrderMutiSetService;
@GetMapping("/udiwms/inout/muti/filterList")
public BaseResponse filterList(IoOrderMutiSetRequest ioOrderMutiSetRequest) {
List<IoOrderMutiSetResponse> list = ioOrderMutiSetService.filterList(ioOrderMutiSetRequest);
PageInfo<IoOrderMutiSetResponse> pageInfo = new PageInfo<>(list);
return ResultVOUtils.page(pageInfo);
}
@PostMapping("/udiwms/inout/muti/add")
public BaseResponse addIoOrderMuti(@RequestBody IoOrderMutiSetEntity ioOrderMutiSetEntity) {
QueryWrapper<IoOrderMutiSetEntity> ew=new QueryWrapper<>();
ew.eq("curInv",ioOrderMutiSetEntity.getCurInv());
long count=ioOrderMutiSetService.count(ew);
if(count>0){
return ResultVOUtils.error(999,"已存在该仓库的出入库设置!");
}
ioOrderMutiSetEntity.setId(IdUtil.getSnowflakeNextId());
ioOrderMutiSetEntity.setUpdateTime(new Date());
Boolean falg=ioOrderMutiSetService.save(ioOrderMutiSetEntity);
if(falg){
return ResultVOUtils.success();
}else{
return ResultVOUtils.error(999,"添加失败");
}
}
@PostMapping("/udiwms/inout/muti/update")
public BaseResponse updateIoOrderMuti(@RequestBody IoOrderMutiSetEntity ioOrderMutiSetEntity) {
QueryWrapper<IoOrderMutiSetEntity> ew=new QueryWrapper<>();
ew.eq("curInv",ioOrderMutiSetEntity.getCurInv());
IoOrderMutiSetEntity ioOrderMutiSetServiceOne=ioOrderMutiSetService.getOne(ew);
if(!ioOrderMutiSetServiceOne.getId().equals(ioOrderMutiSetEntity.getId())){
return ResultVOUtils.error(999,"已存在该仓库的出入库设置!");
}
ioOrderMutiSetEntity.setUpdateTime(new Date());
Boolean falg=ioOrderMutiSetService.updateById(ioOrderMutiSetEntity);
if(falg){
return ResultVOUtils.success();
}else{
return ResultVOUtils.error(999,"更新失败");
}
}
@PostMapping("/udiwms/inout/muti/detail")
public BaseResponse detailIoOrderMuti(@RequestBody IoOrderMutiSetEntity ioOrderMutiSetEntity) {
Boolean falg=ioOrderMutiSetService.removeById(ioOrderMutiSetEntity);
if(falg){
return ResultVOUtils.success();
}else{
return ResultVOUtils.error(999,"删除失败");
}
}
}

@ -25,6 +25,7 @@ public class InvPlaceOrderController {
public BaseResponse filterList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest) {
List<InvPlaceOrderResponse> list = invPlaceOrderService.filterList(filterInvPlaceOrderRequest);
PageInfo<InvPlaceOrderResponse> pageInfo = new PageInfo<>(list);
System.out.println("6666666666666666");
return ResultVOUtils.page(pageInfo);
}

@ -149,7 +149,6 @@ public class IoPurChangeService {
//插入计划主表
purPlanService.insert(purPlanEntity);
//用stream流复制list
System.out.println("111111111111111111111111111我要进来咯666666666666666++++++++++++++++");
purPlanDetailEntityList = purApplyDetailEntityList.stream().map(e -> {
PurPlanDetailEntity d = new PurPlanDetailEntity();
d.setOrderIdFk(purPlanEntity.getId() + "");
@ -158,7 +157,6 @@ public class IoPurChangeService {
d.setCount(e.getCount());
d.setSupId(e.getSupId());
d.setZczbhhzbapzbh(e.getZczbhhzbapzbh());
System.out.println("ddddddddddddddddddddddddddddddd"+d);
return d;
}).collect(Collectors.toList());
purPlanDetailService.insertPurPlanDetailEntity(purPlanDetailEntityList);

@ -84,4 +84,6 @@ public interface UdiProductDao {
* @return
*/
UdiProductEntity selectAllowNoBatch(@Param("nameCode") String nameCode);
UdiProductEntity selectUdiByName(@Param("nameCode") String nameCode);
}

@ -2,8 +2,14 @@ package com.glxp.api.dao.inout;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inout.IoOrderMutiEntity;
import com.glxp.api.req.inout.IoOrderMutiRequest;
import com.glxp.api.res.inout.IoOrderMutiResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface IoOrderMutiMapper extends BaseMapper<IoOrderMutiEntity> {
List<IoOrderMutiResponse> filterList(IoOrderMutiRequest ioOrderMutiRequest);
}

@ -2,8 +2,14 @@ package com.glxp.api.dao.inout;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inout.IoOrderMutiSetEntity;
import com.glxp.api.req.inout.IoOrderMutiSetRequest;
import com.glxp.api.res.inout.IoOrderMutiSetResponse;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface IoOrderMutiSetMapper extends BaseMapper<IoOrderMutiSetEntity> {
List<IoOrderMutiSetResponse> filterList(IoOrderMutiSetRequest ioOrderMutiSetRequest);
}

@ -136,4 +136,10 @@ public class IoOrderMutiEntity {
@TableField(value = "auditTime")
private Date auditTime;
/**
* 01
*/
@TableField(value = "status")
private Integer status;
}

@ -27,4 +27,8 @@ public class IoOrderMutiSetEntity {
@TableField(value = "updateTime")
private Date updateTime;
@TableField(value = "checkUse")
private Integer checkUse;
}

@ -57,4 +57,11 @@ public class IoOrderMutiUseEntity {
*/
@TableField(value = "remark")
private String remark;
@TableField(value = "status")
private Integer status;
@TableField(exist=false)
private String createUserName;
}

@ -0,0 +1,39 @@
package com.glxp.api.req.inout;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import java.util.Date;
@Data
public class IoOrderMutiRequest extends ListPageRequest {
private Long id;
private String orderIdFk;
private String udiCode;
private String relIdFk;
private String mark;
private Integer totalCount;
private Integer useCount;
private Integer reCount;
private Date createTime;
private Date updateTime;
private String createUser;
private String updateUser;
private String reamrk;
private String nameCode;
private String batchNo;
private String produceDate;
private String expireDate;
private String serialNo;
private String supId;
private String auditUser;
private Date auditTime;
private String cpmctymc;
private String ggxh;
private Integer status;
private String createUserName;
private String startDate;
private String endDate;
}

@ -0,0 +1,22 @@
package com.glxp.api.req.inout;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
import java.util.Date;
@Data
public class IoOrderMutiSetRequest extends ListPageRequest {
private Long id;
private String curInv;
private String fromCorp;
private String targetAction;
private String remark;
private Date updateTime;
private String invName;
private String fromCorpName;
private String targetActionName;
private Integer checkUse;
}

@ -0,0 +1,41 @@
package com.glxp.api.res.inout;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import java.util.Date;
@Data
public class IoOrderMutiResponse {
private Long id;
private String orderIdFk;
private String udiCode;
private String relIdFk;
private String mark;
private Integer totalCount;
private Integer useCount;
private Integer reCount;
private Date createTime;
private Date updateTime;
private String createUser;
private String updateUser;
private String reamrk;
private String nameCode;
private String batchNo;
private String produceDate;
private String expireDate;
private String serialNo;
private String supId;
private String auditUser;
private Date auditTime;
private String cpmctymc;
private String ggxh;
private Integer status;
private String createUserName;
private String auditUserName;
}

@ -0,0 +1,21 @@
package com.glxp.api.res.inout;
import lombok.Data;
import java.util.Date;
@Data
public class IoOrderMutiSetResponse {
private Long id;
private String curInv;
private String fromCorp;
private String targetAction;
private String remark;
private Date updateTime;
private String invName;
private String fromCorpName;
private String targetActionName;
private Integer checkUse;
}

@ -113,4 +113,10 @@ public class InvProductResponse {
private String code;
/*
*
* */
private String measname;
}

@ -53,4 +53,6 @@ public interface BasicCorpService {
List<BasicCorpEntity> getCorpList();
List<BasicCorpEntity> selectCorpList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest);
}

@ -60,4 +60,6 @@ public interface UdiProductService {
* @return
*/
UdiProductEntity getAllowNoBatch(String nameCode);
UdiProductEntity selectUdiByName(String nameCode);
}

@ -128,6 +128,11 @@ public class BasicCorpServiceImpl implements BasicCorpService {
return basicCorpDao.getCorpList();
}
@Override
public List<BasicCorpEntity> selectCorpList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest) {
return basicCorpDao.filterList(basicUnitMaintainFilterRequest);
}
@Override
public BasicCorpEntity selectById(String id) {
return basicCorpDao.selectById(id);

@ -155,4 +155,9 @@ public class UdiProductServiceImpl implements UdiProductService {
String di = FilterUdiUtils.getDiStr(nameCode);
return udiProductDao.selectAllowNoBatch(di);
}
@Override
public UdiProductEntity selectUdiByName(String nameCode) {
return udiProductDao.selectUdiByName(nameCode);
}
}

@ -2,7 +2,13 @@ package com.glxp.api.service.inout;
import com.glxp.api.entity.inout.IoOrderMutiEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import com.glxp.api.req.inout.IoOrderMutiRequest;
import com.glxp.api.res.inout.IoOrderMutiResponse;
import java.util.List;
public interface IoOrderMutiService extends IService<IoOrderMutiEntity>{
List<IoOrderMutiResponse> filterList(IoOrderMutiRequest ioOrderMutiRequest);
}

@ -2,7 +2,17 @@ package com.glxp.api.service.inout;
import com.glxp.api.entity.inout.IoOrderMutiSetEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import com.glxp.api.req.inout.IoOrderMutiSetRequest;
import com.glxp.api.res.inout.IoOrderMutiSetResponse;
import java.util.List;
public interface IoOrderMutiSetService extends IService<IoOrderMutiSetEntity>{
List<IoOrderMutiSetResponse> filterList(IoOrderMutiSetRequest ioOrderMutiSetRequest);
}

@ -5,4 +5,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface IoOrderMutiUseService extends IService<IoOrderMutiUseEntity>{
}

@ -1,11 +1,35 @@
package com.glxp.api.service.inout.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.req.inout.IoOrderMutiRequest;
import com.glxp.api.res.inout.IoOrderMutiResponse;
import com.glxp.api.res.inout.IoOrderMutiSetResponse;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.entity.inout.IoOrderMutiEntity;
import com.glxp.api.dao.inout.IoOrderMutiMapper;
import com.glxp.api.service.inout.IoOrderMutiService;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class IoOrderMutiServiceImpl extends ServiceImpl<IoOrderMutiMapper, IoOrderMutiEntity> implements IoOrderMutiService{
@Resource
private IoOrderMutiMapper ioOrderMutiMapper;
@Override
public List<IoOrderMutiResponse> filterList(IoOrderMutiRequest ioOrderMutiRequest) {
if (ioOrderMutiRequest == null) {
return Collections.emptyList();
}
if (ioOrderMutiRequest.getPage() != null) {
int offset = (ioOrderMutiRequest.getPage() - 1) * ioOrderMutiRequest.getLimit();
PageHelper.offsetPage(offset, ioOrderMutiRequest.getLimit());
}
List<IoOrderMutiResponse> ioOrderMutiEntityList=ioOrderMutiMapper.filterList(ioOrderMutiRequest);
return ioOrderMutiEntityList;
}
}

@ -1,11 +1,35 @@
package com.glxp.api.service.inout.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.req.inout.IoOrderMutiSetRequest;
import com.glxp.api.res.inout.IoOrderMutiSetResponse;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.entity.inout.IoOrderMutiSetEntity;
import com.glxp.api.dao.inout.IoOrderMutiSetMapper;
import com.glxp.api.service.inout.IoOrderMutiSetService;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class IoOrderMutiSetServiceImpl extends ServiceImpl<IoOrderMutiSetMapper, IoOrderMutiSetEntity> implements IoOrderMutiSetService{
@Resource
private IoOrderMutiSetMapper ioOrderMutiSetMapper;
@Override
public List<IoOrderMutiSetResponse> filterList(IoOrderMutiSetRequest ioOrderMutiSetRequest) {
if (ioOrderMutiSetRequest == null) {
return Collections.emptyList();
}
if (ioOrderMutiSetRequest.getPage() != null) {
int offset = (ioOrderMutiSetRequest.getPage() - 1) * ioOrderMutiSetRequest.getLimit();
PageHelper.offsetPage(offset, ioOrderMutiSetRequest.getLimit());
}
List<IoOrderMutiSetResponse> ioOrderMutiSetEntityList=ioOrderMutiSetMapper.filterList(ioOrderMutiSetRequest);
return ioOrderMutiSetEntityList;
}
}

@ -252,4 +252,29 @@ public class GennerOrderUtils {
return completionRandom(serialWithPrefix, orderNoTypeEnum);
}
/**
*
*
* @param orderNoTypeEnum
* @return
*/
public String createOrderMark(OrderNoTypeBean orderNoTypeEnum) {
//获得单号前缀
//格式 固定前缀 +时间前缀 示例
String formNoPrefix = getFormNoPrefix(orderNoTypeEnum);
//获得缓存key
String cacheKey = getStatCacheKey(formNoPrefix);
//获得当日自增数
Long incrementalSerial = redisUtil.incr(cacheKey, 1);
// 设置key过期时间, 保证每天的流水号从1开始
if (incrementalSerial == 1) {
//设置失效时间 凌晨过期
redisUtil.expire(cacheKey, getSecondsNextEarlyMorning());
}
//组合单号并补全流水号
String serialWithPrefix = completionSerial(formNoPrefix, incrementalSerial, orderNoTypeEnum);
//补全随机数
return completionRandom(serialWithPrefix, orderNoTypeEnum);
}
}

@ -42,4 +42,13 @@ public class OrderNoTypeBean {
this.randomLength = 0;
this.totalLength = 5;
}
public OrderNoTypeBean(String datePattern) {
this.prefix = "";
this.datePattern = datePattern;
this.serialLength = 3;
this.randomLength = 0;
this.totalLength = 3;
}
}

@ -961,4 +961,15 @@
where nameCode = #{nameCode}
limit 1
</select>
<select id="selectUdiByName" resultType="com.glxp.api.entity.basic.UdiProductEntity">
SELECT b1.*,
b2.id as relId,
c1.customerId as supId
FROM basic_products b1
LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
LEFT JOIN company_product_relevance c1 ON c1.udiRlIdFk = b2.id
where nameCode = #{nameCode}
limit 1
</select>
</mapper>

@ -1,4 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.inout.IoOrderMutiMapper">
<select id="filterList" parameterType="com.glxp.api.req.inout.IoOrderMutiRequest"
resultType="com.glxp.api.res.inout.IoOrderMutiResponse">
SELECT
io.*,
b1.ggxh,
b1.cpmctymc,
(SELECT userName FROM auth_user WHERE auth_user.id=io.createUser) as createUserName,
(SELECT userName FROM auth_user WHERE auth_user.id=io.auditUser) as auditUserName
FROM
io_order_muti io
LEFT JOIN basic_products b1 on b1.nameCode=io.nameCode
<where>
<if test=" udiCode!= '' and udiCode != null">
and io.udiCode = #{udiCode}
</if>
<if test=" mark!= '' and mark != null">
and io.mark = #{mark}
</if>
<if test=" orderIdFk!= '' and orderIdFk != null">
and io.orderIdFk = #{orderIdFk}
</if>
<if test=" nameCode!= '' and nameCode != null">
and io.nameCode = #{nameCode}
</if>
<if test=" ggxh!= '' and ggxh != null">
and b1.ggxh = #{ggxh}
</if>
<if test=" cpmctymc!= '' and cpmctymc != null">
and b1.cpmctymc = #{cpmctymc}
</if>
<if test="status != null">
and io.status = #{status}
</if>
<if test=" createUser!= '' and createUser != null">
and io.createUser = #{createUser}
</if>
<if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
AND date_format(io.createTime, '%Y-%m-%d') between date_format(#{startDate},
'%Y-%m-%d') and date_format(#{endDate}, '%Y-%m-%d')
</if>
</where>
</select>
</mapper>

@ -1,4 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.inout.IoOrderMutiSetMapper">
<select id="filterList" parameterType="com.glxp.api.req.inout.IoOrderMutiSetRequest"
resultType="com.glxp.api.res.inout.IoOrderMutiSetResponse">
SELECT io.*,
(SELECT NAME FROM auth_warehouse aw WHERE aw.CODE = io.curInv) invName,
(SELECT NAME FROM basic_corp bc WHERE bc.erpId = io.fromCorp) fromCorpName,
(SELECT NAME FROM basic_bussiness_type bus WHERE bus.action = io.targetAction) targetActionName
FROM io_order_muti_set io
left join auth_warehouse a1 on a1.code=io.curInv
<where>
<if test=" curInv!= '' and curInv != null">
and a1.name = #{curInv}
</if>
</where>
</select>
</mapper>

@ -9,6 +9,7 @@
bp.cpmctymc,
ipp.relId,
bp.ggxh,
bp.measname,
ipp.batchNo,
ipp.produceDate,
ipp.expireDate,

Loading…
Cancel
Save