Merge remote-tracking branch 'origin/dev' into dev
1178634255
2 years ago
commit
7979d561ca
@ -0,0 +1,55 @@
|
||||
package com.glxp.api.controller.inv;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.glxp.api.annotation.Log;
|
||||
import com.glxp.api.common.enums.ResultEnum;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.constant.BusinessType;
|
||||
import com.glxp.api.controller.BaseController;
|
||||
import com.glxp.api.entity.inv.InvProductDetailEntity;
|
||||
import com.glxp.api.entity.inv.InvProductEntity;
|
||||
import com.glxp.api.entity.inv.InvUserProductEntity;
|
||||
import com.glxp.api.req.inv.FilterInvProductDetailRequest;
|
||||
import com.glxp.api.req.system.DeleteRequest;
|
||||
import com.glxp.api.service.inv.InvProductDetailService;
|
||||
import com.glxp.api.service.inv.InvUserProductService;
|
||||
import groovy.util.logging.Slf4j;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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;
|
||||
|
||||
/**
|
||||
* 用户库存查询接口
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
public class InvUserProductController extends BaseController {
|
||||
|
||||
@Resource
|
||||
private InvUserProductService invUserProductService;
|
||||
@Resource
|
||||
private InvProductDetailService invProductDetailServicel;
|
||||
|
||||
|
||||
// /**
|
||||
// * 添加库存
|
||||
// *
|
||||
// * @param invUserProductEntity
|
||||
// * @return
|
||||
// */
|
||||
// @PostMapping("/spms/inv/user/product/add")
|
||||
// @Log(title = "用户库存查询", businessType = BusinessType.INSERT)
|
||||
// public BaseResponse addInvUserProduct(@RequestBody InvUserProductEntity invUserProductEntity) {
|
||||
//
|
||||
// invUserProductService.
|
||||
//
|
||||
//
|
||||
// }
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.glxp.api.controller.inv;
|
||||
|
||||
import com.glxp.api.controller.BaseController;
|
||||
import groovy.util.logging.Slf4j;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* 用户库存查询接口
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
public class InvUserProductDetailController{
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.glxp.api.dao.inout;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.inout.IoOrderMutiEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface IoOrderMutiMapper extends BaseMapper<IoOrderMutiEntity> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.glxp.api.dao.inout;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.inout.IoOrderMutiSetEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface IoOrderMutiSetMapper extends BaseMapper<IoOrderMutiSetEntity> {
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.glxp.api.dao.inout;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.inout.IoOrderMutiUseEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface IoOrderMutiUseMapper extends BaseMapper<IoOrderMutiUseEntity> {
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.glxp.api.dao.inv;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.inv.InvUserProductEntity;
|
||||
|
||||
/**
|
||||
* @author Lenovo
|
||||
* @description 针对表【inv_user_product(用户库存表)】的数据库操作Mapper
|
||||
* @createDate 2023-05-12 10:19:43
|
||||
*/
|
||||
public interface InvUserProductDao extends BaseMapper<InvUserProductEntity> {
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package com.glxp.api.dao.inv;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.dao.BaseMapperPlus;
|
||||
import com.glxp.api.entity.inv.InvUserProductDetailEntity;
|
||||
|
||||
/**
|
||||
* @author Lenovo
|
||||
* @description 针对表【inv_user_product_detail(用户库存详情表)】的数据库操作Mapper
|
||||
* @createDate 2023-05-12 10:19:43
|
||||
*/
|
||||
public interface InvUserProductDetailDao extends BaseMapperPlus<InvUserProductDetailDao,InvUserProductDetailEntity,InvUserProductDetailEntity> {
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,139 @@
|
||||
package com.glxp.api.entity.inout;
|
||||
|
||||
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 java.util.Date;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "io_order_muti")
|
||||
public class IoOrderMutiEntity {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 单据外键
|
||||
*/
|
||||
@TableField(value = "orderIdFk")
|
||||
private String orderIdFk;
|
||||
|
||||
/**
|
||||
* udi码
|
||||
*/
|
||||
@TableField(value = "udiCode")
|
||||
private String udiCode;
|
||||
|
||||
/**
|
||||
* 产品ID外键
|
||||
*/
|
||||
@TableField(value = "relIdFk")
|
||||
private String relIdFk;
|
||||
|
||||
/**
|
||||
* 标记值
|
||||
*/
|
||||
@TableField(value = "mark")
|
||||
private String mark;
|
||||
|
||||
/**
|
||||
* 总使用次数
|
||||
*/
|
||||
@TableField(value = "totalCount")
|
||||
private Integer totalCount;
|
||||
|
||||
/**
|
||||
* 已使用次数
|
||||
*/
|
||||
@TableField(value = "useCount")
|
||||
private Integer useCount;
|
||||
|
||||
/**
|
||||
* 剩余可使用次数
|
||||
*/
|
||||
@TableField(value = "reCount")
|
||||
private Integer reCount;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(value = "createTime")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@TableField(value = "`createUser`")
|
||||
private String createUser;
|
||||
|
||||
/**
|
||||
* 更新人
|
||||
*/
|
||||
@TableField(value = "updateUser")
|
||||
private String updateUser;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "reamrk")
|
||||
private String reamrk;
|
||||
|
||||
/**
|
||||
* 产品DI
|
||||
*/
|
||||
@TableField(value = "nameCode")
|
||||
private String nameCode;
|
||||
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
@TableField(value = "batchNo")
|
||||
private String batchNo;
|
||||
|
||||
/**
|
||||
* 生产日期
|
||||
*/
|
||||
@TableField(value = "produceDate")
|
||||
private String produceDate;
|
||||
|
||||
/**
|
||||
* 失效日期
|
||||
*/
|
||||
@TableField(value = "expireDate")
|
||||
private String expireDate;
|
||||
|
||||
/**
|
||||
* 序列号
|
||||
*/
|
||||
@TableField(value = "serialNo")
|
||||
private String serialNo;
|
||||
|
||||
/**
|
||||
* 供应商ID
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private String supId;
|
||||
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
@TableField(value = "auditUser")
|
||||
private String auditUser;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
@TableField(value = "auditTime")
|
||||
private Date auditTime;
|
||||
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package com.glxp.api.entity.inout;
|
||||
|
||||
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 java.util.Date;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "io_order_muti_set")
|
||||
public class IoOrderMutiSetEntity {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Long id;
|
||||
|
||||
@TableField(value = "curInv")
|
||||
private String curInv;
|
||||
|
||||
@TableField(value = "fromCorp")
|
||||
private String fromCorp;
|
||||
|
||||
@TableField(value = "targetAction")
|
||||
private String targetAction;
|
||||
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
package com.glxp.api.entity.inout;
|
||||
|
||||
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 java.util.Date;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "io_order_muti_use")
|
||||
public class IoOrderMutiUseEntity {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Long id;
|
||||
|
||||
@TableField(value = "mutiIdFk")
|
||||
private Long mutiIdFk;
|
||||
|
||||
/**
|
||||
* 当前第几次使用
|
||||
*/
|
||||
@TableField(value = "curIndex")
|
||||
private Integer curIndex;
|
||||
|
||||
/**
|
||||
* 使用人
|
||||
*/
|
||||
@TableField(value = "useUser")
|
||||
private String useUser;
|
||||
|
||||
/**
|
||||
* 使用时间
|
||||
*/
|
||||
@TableField(value = "useTime")
|
||||
private Date useTime;
|
||||
|
||||
/**
|
||||
* 审核人
|
||||
*/
|
||||
@TableField(value = "auditUser")
|
||||
private String auditUser;
|
||||
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
@TableField(value = "auditTime")
|
||||
private Date auditTime;
|
||||
|
||||
/**
|
||||
* 往来单位
|
||||
*/
|
||||
@TableField(value = "fromCorp")
|
||||
private String fromCorp;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
}
|
||||
@ -0,0 +1,135 @@
|
||||
package com.glxp.api.entity.inv;
|
||||
|
||||
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;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 用户库存详情表
|
||||
* @TableName inv_user_product_detail
|
||||
*/
|
||||
@TableName(value ="inv_user_product_detail")
|
||||
@Data
|
||||
public class InvUserProductDetailEntity {
|
||||
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* UDI码
|
||||
*/
|
||||
@TableField(value = "code")
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 订单号外键
|
||||
*/
|
||||
@TableField(value = "orderId")
|
||||
private String orderId;
|
||||
|
||||
/**
|
||||
* 耗材字典ID
|
||||
*/
|
||||
@TableField(value = "relId")
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 最小销售标识
|
||||
*/
|
||||
@TableField(value = "nameCode")
|
||||
private String nameCode;
|
||||
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
@TableField(value = "batchNo")
|
||||
private String batchNo;
|
||||
|
||||
/**
|
||||
* 生产日期
|
||||
*/
|
||||
@TableField(value = "produceDate")
|
||||
private String produceDate;
|
||||
|
||||
/**
|
||||
* 失效日期
|
||||
*/
|
||||
@TableField(value = "expireDate")
|
||||
private String expireDate;
|
||||
|
||||
/**
|
||||
* 序列号
|
||||
*/
|
||||
@TableField(value = "serialNo")
|
||||
private String serialNo;
|
||||
|
||||
/**
|
||||
* 供应商
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private String supId;
|
||||
|
||||
/**
|
||||
* 扫码数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 实际数量
|
||||
*/
|
||||
@TableField(value = "reCount")
|
||||
private Integer reCount;
|
||||
|
||||
|
||||
@TableField(value = "inCount")
|
||||
private Integer inCount;
|
||||
|
||||
|
||||
@TableField(value = "outCount")
|
||||
private Integer outCount;
|
||||
|
||||
/**
|
||||
* 部门编码
|
||||
*/
|
||||
@TableField(value = "deptCode")
|
||||
private String deptCode;
|
||||
|
||||
/**
|
||||
* 仓库编码
|
||||
*/
|
||||
@TableField(value = "invCode")
|
||||
private String invCode;
|
||||
|
||||
/**
|
||||
* 货位编码
|
||||
*/
|
||||
@TableField(value = "invSpaceCode")
|
||||
private String invSpaceCode;
|
||||
|
||||
/**
|
||||
* 采购类型
|
||||
*/
|
||||
@TableField(value = "purchaseType")
|
||||
private Integer purchaseType;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
@TableField(value = "mainAction")
|
||||
private String mainAction;
|
||||
@TableField(value = "action")
|
||||
private String action;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,152 @@
|
||||
package com.glxp.api.entity.inv;
|
||||
|
||||
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;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 用户库存表
|
||||
* @TableName inv_user_product
|
||||
*/
|
||||
@TableName(value ="inv_user_product")
|
||||
@Data
|
||||
public class InvUserProductEntity {
|
||||
|
||||
@TableId(value = "id", type = IdType.AUTO)
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 耗材字典ID
|
||||
*/
|
||||
@TableField(value = "relIdFk")
|
||||
private Long relIdFk;
|
||||
|
||||
/**
|
||||
* 最小销售标识
|
||||
*/
|
||||
@TableField(value = "nameCode")
|
||||
private String nameCode;
|
||||
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
@TableField(value = "batchNo")
|
||||
private String batchNo;
|
||||
|
||||
/**
|
||||
* 生产日期
|
||||
*/
|
||||
@TableField(value = "productionDate")
|
||||
private String productionDate;
|
||||
|
||||
/**
|
||||
* 失效日期
|
||||
*/
|
||||
@TableField(value = "expireDate")
|
||||
private String expireDate;
|
||||
|
||||
/**
|
||||
* 入库数量
|
||||
*/
|
||||
@TableField(value = "inCount")
|
||||
private Integer inCount;
|
||||
|
||||
/**
|
||||
* 出库数量
|
||||
*/
|
||||
@TableField(value = "outCount")
|
||||
private int outCount;
|
||||
|
||||
/**
|
||||
* 实际数量
|
||||
*/
|
||||
@TableField(value = "reCount")
|
||||
private int reCount;
|
||||
|
||||
/**
|
||||
* 客户ID
|
||||
*/
|
||||
@TableField(value = "customerId")
|
||||
private String customerId;
|
||||
|
||||
/**
|
||||
* 供应商ID
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private String supId;
|
||||
|
||||
/**
|
||||
* 部门编码
|
||||
*/
|
||||
@TableField(value = "deptCode")
|
||||
private String deptCode;
|
||||
|
||||
/**
|
||||
* 仓库编码
|
||||
*/
|
||||
@TableField(value = "invCode")
|
||||
private String invCode;
|
||||
|
||||
/**
|
||||
* 货位编码
|
||||
*/
|
||||
@TableField(value = "invSpaceCode")
|
||||
private String invSpaceCode;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@TableField(value = "createTime")
|
||||
private Date createTime;
|
||||
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private Integer nowStock;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private Integer frozenCount;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private Integer planInCount;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private Integer planOutCount;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private Integer onWayCount;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private Integer availableStock;
|
||||
|
||||
|
||||
@TableField(value = "type")
|
||||
private Integer type;
|
||||
|
||||
@TableField(value = "userId")
|
||||
private String userId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package com.glxp.api.service.inout;
|
||||
|
||||
import com.glxp.api.entity.inout.IoOrderMutiEntity;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
public interface IoOrderMutiService extends IService<IoOrderMutiEntity>{
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package com.glxp.api.service.inout;
|
||||
|
||||
import com.glxp.api.entity.inout.IoOrderMutiSetEntity;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
public interface IoOrderMutiSetService extends IService<IoOrderMutiSetEntity>{
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package com.glxp.api.service.inout;
|
||||
|
||||
import com.glxp.api.entity.inout.IoOrderMutiUseEntity;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
public interface IoOrderMutiUseService extends IService<IoOrderMutiUseEntity>{
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.glxp.api.service.inout.impl;
|
||||
|
||||
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;
|
||||
@Service
|
||||
public class IoOrderMutiServiceImpl extends ServiceImpl<IoOrderMutiMapper, IoOrderMutiEntity> implements IoOrderMutiService{
|
||||
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.glxp.api.service.inout.impl;
|
||||
|
||||
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;
|
||||
@Service
|
||||
public class IoOrderMutiSetServiceImpl extends ServiceImpl<IoOrderMutiSetMapper, IoOrderMutiSetEntity> implements IoOrderMutiSetService{
|
||||
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.glxp.api.service.inout.impl;
|
||||
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.glxp.api.dao.inout.IoOrderMutiUseMapper;
|
||||
import com.glxp.api.entity.inout.IoOrderMutiUseEntity;
|
||||
import com.glxp.api.service.inout.IoOrderMutiUseService;
|
||||
@Service
|
||||
public class IoOrderMutiUseServiceImpl extends ServiceImpl<IoOrderMutiUseMapper, IoOrderMutiUseEntity> implements IoOrderMutiUseService{
|
||||
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
package com.glxp.api.service.inv;
|
||||
|
||||
|
||||
import com.glxp.api.entity.inv.InvUserProductDetailEntity;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Lenovo
|
||||
* @description 针对表【inv_user_product_detail(用户库存详情表)】的数据库操作Service
|
||||
* @createDate 2023-05-12 10:19:43
|
||||
*/
|
||||
public interface InvUserProductDetailService{
|
||||
|
||||
List<InvUserProductDetailEntity> filterInvUserProductDetailList(InvUserProductDetailEntity invUserProductDetailEntity);
|
||||
|
||||
Boolean addInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity);
|
||||
|
||||
Boolean addInvUserProductDetailList(List<InvUserProductDetailEntity> invUserProductDetailEntityList);
|
||||
|
||||
Boolean updateInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity);
|
||||
|
||||
Boolean delectInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity);
|
||||
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package com.glxp.api.service.inv;
|
||||
|
||||
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.entity.inv.InvProductEntity;
|
||||
import com.glxp.api.entity.inv.InvUserProductEntity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Lenovo
|
||||
* @description 针对表【inv_user_product(用户库存表)】的数据库操作Service
|
||||
* @createDate 2023-05-12 10:19:43
|
||||
*/
|
||||
public interface InvUserProductService{
|
||||
|
||||
List<InvUserProductEntity> filterInvUserProductList(InvUserProductEntity invUserProductEntity);
|
||||
|
||||
Boolean addInvUserProduct(InvUserProductEntity invUserProductEntity);
|
||||
|
||||
Boolean updateInvUserProduct(InvUserProductEntity invUserProductEntity);
|
||||
|
||||
Boolean delectInvUserProduct(InvUserProductEntity invUserProductEntity);
|
||||
|
||||
InvUserProductEntity selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode,String userId,Integer type);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,47 @@
|
||||
package com.glxp.api.service.inv.impl;
|
||||
|
||||
|
||||
import com.glxp.api.dao.inv.InvUserProductDetailDao;
|
||||
import com.glxp.api.entity.inv.InvUserProductDetailEntity;
|
||||
import com.glxp.api.service.inv.InvUserProductDetailService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Lenovo
|
||||
* @description 针对表【inv_user_product_detail(用户库存详情表)】的数据库操作Service实现
|
||||
* @createDate 2023-05-12 10:19:43
|
||||
*/
|
||||
@Service
|
||||
public class InvUserProductDetailServiceImpl implements InvUserProductDetailService {
|
||||
|
||||
@Resource
|
||||
InvUserProductDetailDao invUserProductDetailDao;
|
||||
|
||||
@Override
|
||||
public List<InvUserProductDetailEntity> filterInvUserProductDetailList(InvUserProductDetailEntity invUserProductDetailEntity) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean addInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) {
|
||||
return invUserProductDetailDao.insert(invUserProductDetailEntity) == 1 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean addInvUserProductDetailList(List<InvUserProductDetailEntity> invUserProductDetailEntityList) {
|
||||
return invUserProductDetailDao.insertBatch(invUserProductDetailEntityList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean updateInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) {
|
||||
return invUserProductDetailDao.updateById(invUserProductDetailEntity) == 1 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean delectInvUserProductDetail(InvUserProductDetailEntity invUserProductDetailEntity) {
|
||||
return invUserProductDetailDao.deleteById(invUserProductDetailEntity) == 1 ? true : false;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
package com.glxp.api.service.inv.impl;
|
||||
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.glxp.api.dao.inv.InvUserProductDao;
|
||||
import com.glxp.api.entity.inv.InvProductEntity;
|
||||
import com.glxp.api.entity.inv.InvUserProductEntity;
|
||||
import com.glxp.api.service.inv.InvUserProductService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Lenovo
|
||||
* @description 针对表【inv_user_product(用户库存表)】的数据库操作Service实现
|
||||
* @createDate 2023-05-12 10:19:43
|
||||
*/
|
||||
@Service
|
||||
public class InvUserProductServiceImpl implements InvUserProductService {
|
||||
|
||||
@Resource
|
||||
InvUserProductDao invUserProductDao;
|
||||
|
||||
@Override
|
||||
public List<InvUserProductEntity> filterInvUserProductList(InvUserProductEntity invUserProductEntity) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean addInvUserProduct(InvUserProductEntity invUserProductEntity) {
|
||||
return invUserProductDao.insert(invUserProductEntity) == 1 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean updateInvUserProduct(InvUserProductEntity invUserProductEntity) {
|
||||
return invUserProductDao.updateById(invUserProductEntity) == 1 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean delectInvUserProduct(InvUserProductEntity invUserProductEntity) {
|
||||
return invUserProductDao.deleteById(invUserProductEntity) == 1 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public InvUserProductEntity selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode,String userId,Integer type) {
|
||||
return invUserProductDao.selectOne(new QueryWrapper<InvUserProductEntity>().eq("relIdFk", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
|
||||
.isNull(StrUtil.isEmpty(batchNo), "batchNo").eq("supId", supId).eq("deptCode", deptCode)
|
||||
.eq("invCode", invCode).eq("userId",userId).eq("type",type));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
<?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">
|
||||
</mapper>
|
||||
@ -0,0 +1,4 @@
|
||||
<?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">
|
||||
</mapper>
|
||||
@ -0,0 +1,4 @@
|
||||
<?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.IoOrderMutiUseMapper">
|
||||
</mapper>
|
||||
@ -0,0 +1,8 @@
|
||||
<?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.inv.InvUserProductDetailDao">
|
||||
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,7 @@
|
||||
<?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.inv.InvUserProductDao">
|
||||
|
||||
</mapper>
|
||||
@ -1,97 +1,101 @@
|
||||
<?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.purchase.PurOrderDao">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurOrderEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table pur_order-->
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="billNo" jdbcType="VARCHAR" property="billNo" />
|
||||
<result column="billDate" jdbcType="TIMESTAMP" property="billDate" />
|
||||
<result column="status" jdbcType="TINYINT" property="status" />
|
||||
<result column="billType" jdbcType="VARCHAR" property="billType" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
<result column="invCode" jdbcType="VARCHAR" property="invCode" />
|
||||
<result column="deptCode" jdbcType="VARCHAR" property="deptCode" />
|
||||
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
|
||||
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="auditUser" jdbcType="VARCHAR" property="auditUser" />
|
||||
<result column="auditTime" jdbcType="TIMESTAMP" property="auditTime" />
|
||||
<result column="auditRemark" jdbcType="VARCHAR" property="auditRemark" />
|
||||
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
<result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
|
||||
<result column="applyCreateUser" jdbcType="VARCHAR" property="applyCreateUser" />
|
||||
<result column="applyAuditUser" jdbcType="VARCHAR" property="applyAuditUser" />
|
||||
<result column="applyRemark" jdbcType="VARCHAR" property="applyRemark" />
|
||||
<result column="applyBillNo" jdbcType="VARCHAR" property="applyBillNo" />
|
||||
<result column="stockOrderNo" jdbcType="VARCHAR" property="stockOrderNo" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`,
|
||||
createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser,
|
||||
applyAuditUser, applyRemark, applyBillNo, stockOrderNo
|
||||
</sql>
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurOrderEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table pur_order-->
|
||||
<id column="id" jdbcType="BIGINT" property="id"/>
|
||||
<result column="billNo" jdbcType="VARCHAR" property="billNo"/>
|
||||
<result column="billDate" jdbcType="TIMESTAMP" property="billDate"/>
|
||||
<result column="status" jdbcType="TINYINT" property="status"/>
|
||||
<result column="billType" jdbcType="VARCHAR" property="billType"/>
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark"/>
|
||||
<result column="invCode" jdbcType="VARCHAR" property="invCode"/>
|
||||
<result column="deptCode" jdbcType="VARCHAR" property="deptCode"/>
|
||||
<result column="createUser" jdbcType="VARCHAR" property="createUser"/>
|
||||
<result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
|
||||
<result column="auditUser" jdbcType="VARCHAR" property="auditUser"/>
|
||||
<result column="auditTime" jdbcType="TIMESTAMP" property="auditTime"/>
|
||||
<result column="auditRemark" jdbcType="VARCHAR" property="auditRemark"/>
|
||||
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
|
||||
<result column="updateUser" jdbcType="VARCHAR" property="updateUser"/>
|
||||
<result column="applyCreateUser" jdbcType="VARCHAR" property="applyCreateUser"/>
|
||||
<result column="applyAuditUser" jdbcType="VARCHAR" property="applyAuditUser"/>
|
||||
<result column="applyRemark" jdbcType="VARCHAR" property="applyRemark"/>
|
||||
<result column="applyBillNo" jdbcType="VARCHAR" property="applyBillNo"/>
|
||||
<result column="stockOrderNo" jdbcType="VARCHAR" property="stockOrderNo"/>
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`,
|
||||
createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser,
|
||||
applyAuditUser, applyRemark, applyBillNo, stockOrderNo
|
||||
</sql>
|
||||
|
||||
|
||||
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderRequest"
|
||||
resultType="com.glxp.api.res.purchase.PurOrderResponse">
|
||||
|
||||
SELECT
|
||||
pur_order.*,
|
||||
cb.employeeName createUserName,
|
||||
ab.employeeName auditUserName,
|
||||
auth_warehouse.NAME invName,
|
||||
auth_dept.`name` deptName
|
||||
FROM
|
||||
pur_order
|
||||
LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
|
||||
LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
|
||||
LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
|
||||
LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
|
||||
<where>
|
||||
<if test="billNo != '' and billNo != null">
|
||||
AND billNo = #{billNo}
|
||||
</if>
|
||||
<if test="startDate != null and startDate !=''">
|
||||
<![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d')>= #{startDate}]]>
|
||||
</if>
|
||||
<if test="endDate != null and endDate !=''">
|
||||
<![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d') <= #{endDate}]]>
|
||||
</if>
|
||||
<if test="startAuditDate != null and startAuditDate !=''">
|
||||
<![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]>
|
||||
</if>
|
||||
<if test="endAuditDate != null and endAuditDate !=''">
|
||||
<![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]>
|
||||
</if>
|
||||
<if test="status!=null and status!=10 and status!=11">
|
||||
and pur_order.status = #{status}
|
||||
</if>
|
||||
<if test="status ==10">
|
||||
and ( pur_order.status = 3 or pur_order.status=2 or pur_order.status=4)
|
||||
</if>
|
||||
<if test="status ==11">
|
||||
and ( pur_order.status = 1 or pur_order.status=2 or pur_order.status=4)
|
||||
</if>
|
||||
|
||||
<if test="deptCode != '' and deptCode != null">
|
||||
AND deptCode = #{deptCode}
|
||||
</if>
|
||||
<if test="invCode != '' and invCode != null">
|
||||
AND invCode = #{invCode}
|
||||
</if>
|
||||
<if test="auditUser != '' and auditUser != null">
|
||||
AND auditUser = #{auditUser}
|
||||
</if>
|
||||
<if test="createUser != '' and createUser != null">
|
||||
AND createUser = #{createUser}
|
||||
</if>
|
||||
<if test="emergency != null">
|
||||
AND emergency = #{emergency}
|
||||
</if>
|
||||
</where>
|
||||
|
||||
</select>
|
||||
|
||||
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderRequest"
|
||||
resultType="com.glxp.api.res.purchase.PurOrderResponse">
|
||||
SELECT pur_order.*,
|
||||
cb.employeeName createUserName,
|
||||
ab.employeeName auditUserName,
|
||||
auth_warehouse.NAME invName,
|
||||
auth_dept.`name` deptName,
|
||||
basic_corp.name supName
|
||||
FROM pur_order
|
||||
LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
|
||||
LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
|
||||
LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
|
||||
LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
|
||||
left join basic_corp on pur_order.supId = basic_corp.erpId
|
||||
<where>
|
||||
<if test="billNo != '' and billNo != null">
|
||||
AND billNo = #{billNo}
|
||||
</if>
|
||||
<if test="startDate != null and startDate != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') >= #{startDate}
|
||||
]]>
|
||||
</if>
|
||||
<if test="endDate != null and endDate != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') <= #{endDate}
|
||||
]]>
|
||||
</if>
|
||||
<if test="startAuditDate != null and startAuditDate != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') >= #{startAuditDate}
|
||||
]]>
|
||||
</if>
|
||||
<if test="endAuditDate != null and endAuditDate != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') <= #{endAuditDate}
|
||||
]]>
|
||||
</if>
|
||||
<if test="status != null and status != 10 and status != 11">
|
||||
and pur_order.status = #{status}
|
||||
</if>
|
||||
<if test="status == 10">
|
||||
and (pur_order.status = 3 or pur_order.status = 2 or pur_order.status = 4)
|
||||
</if>
|
||||
<if test="status == 11">
|
||||
and (pur_order.status = 1 or pur_order.status = 2 or pur_order.status = 4)
|
||||
</if>
|
||||
|
||||
<if test="deptCode != '' and deptCode != null">
|
||||
AND deptCode = #{deptCode}
|
||||
</if>
|
||||
<if test="invCode != '' and invCode != null">
|
||||
AND invCode = #{invCode}
|
||||
</if>
|
||||
<if test="auditUser != '' and auditUser != null">
|
||||
AND auditUser = #{auditUser}
|
||||
</if>
|
||||
<if test="createUser != '' and createUser != null">
|
||||
AND createUser = #{createUser}
|
||||
</if>
|
||||
<if test="emergency != null">
|
||||
AND emergency = #{emergency}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
Loading…
Reference in New Issue