UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
test^2
wangwei 2 years ago
parent 148bf2c1d8 82a9da64aa
commit 19b5e2b163
36 changed files with 1081 additions and 38 deletions
Show Stats Download Patch File Download Diff File

7
src/main/java/com/glxp/api/config/HdSchemaExecutor.java
Unescape Escape View File

@ -74,8 +74,7 @@ public class HdSchemaExecutor implements ApplicationRunner {
}
public void buildSchemas() {
schema.add(new SchemaData("v2.1", "schema_v2.1.sql"));
// schema.add(new SchemaData("v2.2", "schema_v2.2.sql"));
// schema.add(new SchemaData("v2.3", "schema_v2.3.sql"));
// schema.add(new SchemaData("v2.1", "schema_v2.1.sql"));
schema.add(new SchemaData("v2.2", "schema_v2.2.sql"));
}
}
}

12
src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
Unescape Escape View File

@ -121,11 +121,11 @@ public class BasicCorpController {
BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity();
BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity);
basicUnitMaintainEntity.setErpId(CustomUtil.getId());
if(basicUnitMaintainSaveRequest.getCorpType()==1){
if (basicUnitMaintainSaveRequest.getCorpType() == 1) {
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS);
}else if(basicUnitMaintainSaveRequest.getCorpType()==2){
} else if (basicUnitMaintainSaveRequest.getCorpType() == 2) {
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK);
}else{
} else {
basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_INN);
}
basicUnitMaintainEntity.setUpdateTime(new Date());
@ -164,7 +164,11 @@ public class BasicCorpController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
List<Integer> corpTypeLists = new ArrayList<>();
corpTypeLists.add(1);
corpTypeLists.add(2);
basicUnitMaintainFilterRequest.setCorpTypeLists(corpTypeLists);
basicUnitMaintainFilterRequest.setOutType(0);
List<BasicCorpEntity> basicUnitMaintainEntities;
basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
PageInfo<BasicCorpEntity> pageInfo;

1
src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java
Unescape Escape View File

@ -101,6 +101,7 @@ public class DeviceRepairOrderController {
/**
* 删除报修单
*
* @param deleteRequest
* @return
*/

29
src/main/java/com/glxp/api/controller/inv/InvPreProductController.java
Unescape Escape View File

@ -87,6 +87,35 @@ public class InvPreProductController extends BaseController {
return ResultVOUtils.success(pageResponse);
}
/**
* 寄售库存查询接口过滤零库存和负库存
*
* @param filterInvPreProductRequest
* @return
*/
@GetMapping("/spms/inv/pre/product/filterStock")
public BaseResponse filterListStock(FilterInvPreProductRequest filterInvPreProductRequest) {
boolean showSup = false; //前端控制表格显示字段
if (StrUtil.isNotBlank(filterInvPreProductRequest.getUdiCode())) {
filterInvPreProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvPreProductRequest.getUdiCode()));
}
if (StrUtil.isBlank(filterInvPreProductRequest.getInvCode())) {
List<String> invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr());
if (CollUtil.isNotEmpty(invCodes)) {
filterInvPreProductRequest.setInvCodes(invCodes);
}
}
List<InvPreProductResponse> list = invPreProductService.filterListStock(filterInvPreProductRequest);
PageInfo<InvPreProductResponse> pageInfo = new PageInfo<>(list);
InvPreProductPageResponse<InvPreProductResponse> pageResponse = new InvPreProductPageResponse<>();
pageResponse.setList(pageInfo.getList());
pageResponse.setTotal(pageInfo.getTotal());
pageResponse.setShowSup(showSup);
return ResultVOUtils.success(pageResponse);
}
/**
* 查询寄售库存详情
*

37
src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java
Unescape Escape View File

@ -8,15 +8,14 @@ import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
import com.glxp.api.entity.inv.InvPreProductDetailEntity;
import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
import com.glxp.api.req.inv.FilterInvPreinDetailRequest;
import com.glxp.api.req.inv.FilterInvPreinProductRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.inv.*;
import com.glxp.api.res.inv.InvPreProductDetailResponse;
import com.glxp.api.res.inv.InvPreProductPageResponse;
import com.glxp.api.res.inv.InvPreinProductResponse;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.auth.WarehouseUserService;
import com.glxp.api.service.inv.InvPreinDetailService;
import com.glxp.api.service.inv.InvPreinProductDetailService;
import com.glxp.api.service.inv.InvPreinProductService;
import com.glxp.api.util.udi.FilterUdiUtils;
@ -78,6 +77,36 @@ public class InvPreinProductController extends BaseController {
return ResultVOUtils.success(pageResponse);
}
/**
* 预验收库存查询接口过滤零库存和负库存
*
* @param filterInvPreinProductRequest
* @return
*/
@GetMapping("/spms/inv/pre/in/product/filterStock")
public BaseResponse filterListStock(FilterInvPreinProductRequest filterInvPreinProductRequest) {
boolean showSup = false; //前端控制表格显示字段
if (StrUtil.isNotBlank(filterInvPreinProductRequest.getUdiCode())) {
filterInvPreinProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvPreinProductRequest.getUdiCode()));
}
if (StrUtil.isBlank(filterInvPreinProductRequest.getInvCode())) {
List<String> invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr());
if (CollUtil.isNotEmpty(invCodes)) {
filterInvPreinProductRequest.setInvCodes(invCodes);
}
}
List<InvPreinProductResponse> list = invPreinProductService.filterListStock(filterInvPreinProductRequest);
PageInfo<InvPreinProductResponse> pageInfo = new PageInfo<>(list);
InvPreProductPageResponse<InvPreinProductResponse> pageResponse = new InvPreProductPageResponse<>();
pageResponse.setList(pageInfo.getList());
pageResponse.setTotal(pageInfo.getTotal());
pageResponse.setShowSup(showSup);
return ResultVOUtils.success(pageResponse);
}
/**
* 查询预验收库存详情
*

34
src/main/java/com/glxp/api/controller/inv/InvProductController.java
Unescape Escape View File

@ -119,6 +119,40 @@ public class InvProductController extends BaseController {
return ResultVOUtils.success(pageResponse);
}
/**
* 库存列表查询接口过滤零库存负库存
*
* @param filterInvProductRequest
* @return
*/
@GetMapping("/spms/inv/product/filterStock")
public BaseResponse filterListStock(FilterInvProductRequest filterInvProductRequest) {
boolean showSup = false; //前端控制表格显示列字段
if (StrUtil.isNotBlank(filterInvProductRequest.getUdiCode())) {
filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode()));
}
if (StrUtil.isBlank(filterInvProductRequest.getInvCode())) {
List<String> invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr());
if (CollUtil.isNotEmpty(invCodes)) {
filterInvProductRequest.setInvCodes(invCodes);
}
}
List<InvProductResponse> list = invProductService.filterListStock(filterInvProductRequest);
PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
InvProductPageResponse<InvProductResponse> pageResponse = new InvProductPageResponse();
pageResponse.setList(pageInfo.getList());
pageResponse.setTotal(pageInfo.getTotal());
pageResponse.setShowSup(showSup);
return ResultVOUtils.success(pageResponse);
}
/**
* 查询库存详情
*

131
src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
Unescape Escape View File

@ -12,6 +12,9 @@ import com.glxp.api.constant.Constant;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.constant.ConstantType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.controller.inv.InvPreProductController;
import com.glxp.api.controller.inv.InvPreinProductController;
import com.glxp.api.controller.inv.InvProductController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.auth.InvWarehouseEntity;
import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
@ -26,23 +29,33 @@ import com.glxp.api.req.inout.AddReceiveDetailRequest;
import com.glxp.api.req.inout.FilterReceiveDetailRequest;
import com.glxp.api.req.inout.FilterReceiveRequest;
import com.glxp.api.req.inout.UpdateReceiveDetailRequest;
import com.glxp.api.req.purchase.*;
import com.glxp.api.req.inv.FilterInvPreProductRequest;
import com.glxp.api.req.inv.FilterInvPreinProductRequest;
import com.glxp.api.req.inv.FilterInvProductRequest;
import com.glxp.api.req.purchase.purReceiveRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.inout.ReceiveDetailResponse;
import com.glxp.api.res.inout.ReceiveResponse;
import com.glxp.api.res.inv.InvPreProductResponse;
import com.glxp.api.res.inv.InvPreinProductResponse;
import com.glxp.api.res.inv.InvProductResponse;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.auth.InvWarehouseService;
import com.glxp.api.service.auth.WarehouseUserService;
import com.glxp.api.service.basic.IBasicBusTypeChangeService;
import com.glxp.api.service.basic.UdiProductService;
import com.glxp.api.service.inout.IoOrderDetailBizService;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.inout.ReceiveService;
import com.glxp.api.service.inout.ReceivedetailService;
import com.glxp.api.service.inv.InvPreProductService;
import com.glxp.api.service.inv.InvPreinProductService;
import com.glxp.api.service.inv.InvProductService;
import com.glxp.api.service.purchase.*;
import com.glxp.api.util.CustomUtil;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import org.springframework.beans.BeanUtils;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -88,6 +101,13 @@ public class PurOrderReceiveController extends BaseController {
IoOrderDetailBizService ioOrderDetailBizService;
@Resource
IoPurChangeService purChangeService;
@Resource
InvPreProductController invPreProductController;
@Resource
InvPreinProductController invPreinProductController;
@Resource
InvProductController invProductController;
@AuthRuleAnnotation("")
@ -199,12 +219,66 @@ public class PurOrderReceiveController extends BaseController {
return ResultVOUtils.success(orderNo);
}
@Resource
WarehouseUserService warehouseUserService;
@Resource
InvPreProductService invPreProductService;
@Resource
InvPreinProductService invPreinProductService;
@Resource
InvProductService invProductService;
@AuthRuleAnnotation("")
@PostMapping("/udiwms/receive/detail/Update")
public BaseResponse updateReceiveDetail(@RequestBody UpdateReceiveDetailRequest updateReceiveDetailRequest, BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
//判断库存
List<InvPreProductResponse> list = new ArrayList<>();
List<InvPreinProductResponse> listinvprein = new ArrayList<>();
List<InvProductResponse> listInv = new ArrayList<>();
if(updateReceiveDetailRequest.getAdvanceType() == 3){
//寄售
FilterInvPreProductRequest request = new FilterInvPreProductRequest();
// BeanUtils.copyProperties(updateReceiveDetailRequest,request);
request.setNameCode(updateReceiveDetailRequest.getNameCode());
request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
list = selectFilterInvPreProductRequest(request);
}else if(updateReceiveDetailRequest.getAdvanceType() == 2){
//预验收
FilterInvPreinProductRequest request = new FilterInvPreinProductRequest();
// BeanUtils.copyProperties(updateReceiveDetailRequest,request);
request.setNameCode(updateReceiveDetailRequest.getNameCode());
request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
listinvprein = selectfilterListStock(request);
}else{
FilterInvProductRequest request = new FilterInvProductRequest();
// BeanUtils.copyProperties(updateReceiveDetailRequest,request);
request.setNameCode(updateReceiveDetailRequest.getNameCode());
request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
listInv = selectFilterInvProductRequest(request);
}
if(list != null && list.size()>0 ){
if( list.get(0).getReCount() < updateReceiveDetailRequest.getCount() ){
return ResultVOUtils.error(999, "库存不足！");
}
}
if(listinvprein != null && listinvprein.size()>0 ){
if(listinvprein.get(0).getReCount() < updateReceiveDetailRequest.getCount() ){
return ResultVOUtils.error(999, "库存不足！");
}
}
if(listInv != null && listInv.size()>0 ){
if(listInv.get(0).getReCount() < updateReceiveDetailRequest.getCount() ){
return ResultVOUtils.error(999, "库存不足！");
}
}
boolean falg = receivedetailService.updateReceiveDetail(updateReceiveDetailRequest);
if (falg) {
return ResultVOUtils.success();
@ -213,6 +287,59 @@ public class PurOrderReceiveController extends BaseController {
}
}
public List<InvPreProductResponse> selectFilterInvPreProductRequest(FilterInvPreProductRequest filterInvPreProductRequest){
if (StrUtil.isNotBlank(filterInvPreProductRequest.getUdiCode())) {
filterInvPreProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvPreProductRequest.getUdiCode()));
}
if (StrUtil.isBlank(filterInvPreProductRequest.getInvCode())) {
List<String> invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr());
if (CollUtil.isNotEmpty(invCodes)) {
filterInvPreProductRequest.setInvCodes(invCodes);
}
}
List<InvPreProductResponse> list = invPreProductService.filterListStock(filterInvPreProductRequest);
return list;
}
public List<InvPreinProductResponse> selectfilterListStock(FilterInvPreinProductRequest filterInvPreinProductRequest){
boolean showSup = false; //前端控制表格显示字段
if (StrUtil.isNotBlank(filterInvPreinProductRequest.getUdiCode())) {
filterInvPreinProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvPreinProductRequest.getUdiCode()));
}
if (StrUtil.isBlank(filterInvPreinProductRequest.getInvCode())) {
List<String> invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr());
if (CollUtil.isNotEmpty(invCodes)) {
filterInvPreinProductRequest.setInvCodes(invCodes);
}
}
List<InvPreinProductResponse> list = invPreinProductService.filterListStock(filterInvPreinProductRequest);
return list;
}
public List<InvProductResponse> selectFilterInvProductRequest(FilterInvProductRequest filterInvProductRequest){
boolean showSup = false; //前端控制表格显示列字段
if (StrUtil.isNotBlank(filterInvProductRequest.getUdiCode())) {
filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode()));
}
if (StrUtil.isBlank(filterInvProductRequest.getInvCode())) {
List<String> invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr());
if (CollUtil.isNotEmpty(invCodes)) {
filterInvProductRequest.setInvCodes(invCodes);
}
}
List<InvProductResponse> list = invProductService.filterListStock(filterInvProductRequest);
return list;
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/receive/order/del")

9
src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskDetailMapper.java
Unescape Escape View File

@ -0,0 +1,9 @@
package com.glxp.api.dao.inv;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceInspectTaskDetail;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface DeviceInspectTaskDetailMapper extends BaseMapper<DeviceInspectTaskDetail> {
}

9
src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java
Unescape Escape View File

@ -0,0 +1,9 @@
package com.glxp.api.dao.inv;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceInspectTask;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface DeviceInspectTaskMapper extends BaseMapper<DeviceInspectTask> {
}

9
src/main/java/com/glxp/api/dao/inv/DeviceProjectSetMapper.java
Unescape Escape View File

@ -0,0 +1,9 @@
package com.glxp.api.dao.inv;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.glxp.api.entity.inv.DeviceProjectSet;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface DeviceProjectSetMapper extends BaseMapper<DeviceProjectSet> {
}

5
src/main/java/com/glxp/api/dao/inv/InvPreProductDao.java
Unescape Escape View File

@ -2,11 +2,8 @@ package com.glxp.api.dao.inv;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.inv.InvPreProductEntity;
import com.glxp.api.req.inv.FilterInvPlaceRequest;
import com.glxp.api.req.inv.FilterInvPreProductRequest;
import com.glxp.api.res.inv.InvPlaceDetailResponse;
import com.glxp.api.res.inv.InvPreProductResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -23,6 +20,8 @@ public interface InvPreProductDao extends BaseMapperPlus<InvPreProductDao, InvPr
*/
List<InvPreProductResponse> filterList(FilterInvPreProductRequest invPreProductRequest);
List<InvPreProductResponse> filterListStock(FilterInvPreProductRequest invPreProductRequest);
/**

4
src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java
Unescape Escape View File

@ -2,9 +2,7 @@ package com.glxp.api.dao.inv;
import com.glxp.api.dao.BaseMapperPlus;
import com.glxp.api.entity.inv.InvPreinProductEntity;
import com.glxp.api.req.inv.FilterInvPreProductRequest;
import com.glxp.api.req.inv.FilterInvPreinProductRequest;
import com.glxp.api.res.inv.InvPreProductResponse;
import com.glxp.api.res.inv.InvPreinProductResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -25,6 +23,8 @@ public interface InvPreinProductDao extends BaseMapperPlus<InvPreinProductDao, I
*/
List<InvPreinProductResponse> filterList(FilterInvPreinProductRequest invPreProductRequest);
List<InvPreinProductResponse> filterListStock(FilterInvPreinProductRequest invPreProductRequest);
void batchBindSpace(@Param("ids") List<Integer> ids, @Param("invSpaceCode") String invSpaceCode);
/**

8
src/main/java/com/glxp/api/dao/inv/InvProductDao.java
Unescape Escape View File

@ -28,6 +28,14 @@ public interface InvProductDao extends BaseMapperPlus<InvProductDao, InvProductE
*/
List<InvProductResponse> filterProductList(FilterInvProductRequest filterInvProductRequest);
/**
* 查询库存列表过滤零库存和负库存
*
* @param filterInvProductRequest
* @return
*/
List<InvProductResponse> filterProductListStock(FilterInvProductRequest filterInvProductRequest);
/**
* 库存统计查询
*

38
src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java
Unescape Escape View File

@ -90,4 +90,40 @@ public class DeviceInspectPlanEntity {
@TableField(value = "remark")
private String remark;
}
//--------------------------新增字段--------------------------------
/**
* 计划开始时间
*/
private Date startTime;
/**
* 计划结束时间
*/
private Date endTime;
/**
* 时间频率
*/
private String frequency;
/**
* 时间频率单位（1：年；2：月：3：日；4：小时；5：分钟： 6：秒）
*/
private Integer frequencyUnit;
/**
* 计划状态(1:未启用；2：运行中；3：已结束；4：已过期
*/
private Integer planStatus;
/**
* 巡检人
*/
private String inspectUser;
/**
* 上次巡检时间
*/
private Date lastTime;
/**
* 下一次巡检时间
*/
private Date nextTime;
}

96
src/main/java/com/glxp/api/entity/inv/DeviceInspectTask.java
Unescape Escape View File

@ -0,0 +1,96 @@
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 java.io.Serializable;
import java.util.Date;
import lombok.Data;
@Data
@TableName(value = "device_inspect_task")
public class DeviceInspectTask implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
* 任务单号
*/
@TableField(value = "orderId")
private String orderId;
/**
* 巡检计划单号（外键）
*/
@TableField(value = "planOrderIdFk")
private String planOrderIdFk;
/**
* 部门
*/
@TableField(value = "deptCode")
private String deptCode;
/**
* 仓库
*/
@TableField(value = "invCode")
private String invCode;
/**
* 资产编码
*/
@TableField(value = "code")
private String code;
/**
* 状态
*/
@TableField(value = "`status`")
private String status;
/**
* 巡检人
*/
@TableField(value = "inspectUser")
private String inspectUser;
/**
* 提醒时间
*/
@TableField(value = "remindTime")
private Date remindTime;
/**
* 巡检备注
*/
@TableField(value = "remark")
private String remark;
/**
* 任务开始时间
*/
@TableField(value = "strartTime")
private Date strartTime;
/**
* 任务结束时间
*/
@TableField(value = "endTime")
private Date endTime;
/**
* 创建时间
*/
@TableField(value = "createTime")
private Date createTime;
/**
* 更新时间
*/
@TableField(value = "updateTime")
private Date updateTime;
private static final long serialVersionUID = 1L;
}

66
src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskDetail.java
Unescape Escape View File

@ -0,0 +1,66 @@
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 java.io.Serializable;
import java.util.Date;
import lombok.Data;
@Data
@TableName(value = "device_inspect_task_detail")
public class DeviceInspectTaskDetail implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
* 巡检项目编码
*/
@TableField(value = "projectCode")
private String projectCode;
/**
* 巡检内容
*/
@TableField(value = "projectContent")
private String projectContent;
/**
* 状态（1：未开始；2：已检查；3：异常；4：不巡检
*/
@TableField(value = "`status`")
private String status;
/**
* 巡检结果备注
*/
@TableField(value = "`result`")
private String result;
/**
* 巡检图片
*/
@TableField(value = "inspectImage")
private String inspectImage;
/**
* 巡检人
*/
@TableField(value = "inspectUser")
private String inspectUser;
/**
* 更新时间
*/
@TableField(value = "updateTime")
private Date updateTime;
/**
* 巡检任务ID外键
*/
@TableField(value = "taskOrderIdFk")
private String taskOrderIdFk;
private static final long serialVersionUID = 1L;
}

66
src/main/java/com/glxp/api/entity/inv/DeviceProjectSet.java
Unescape Escape View File

@ -0,0 +1,66 @@
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 java.io.Serializable;
import java.util.Date;
import lombok.Data;
@Data
@TableName(value = "device_project_set")
public class DeviceProjectSet implements Serializable {
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
* 项目编号
*/
@TableField(value = "code")
private String code;
/**
* 项目内容
*/
@TableField(value = "content")
private String content;
/**
* 项目类型：1：巡检；2：养护
*/
@TableField(value = "`type`")
private Integer type;
/**
* 备注
*/
@TableField(value = "remak")
private String remak;
/**
* 更新时间
*/
@TableField(value = "udpateTime")
private Date udpateTime;
/**
* 更新人
*/
@TableField(value = "updateUser")
private String updateUser;
/**
* 创建人
*/
@TableField(value = "`createUser`")
private String createUser;
/**
* 创建时间
*/
@TableField(value = "createTime")
private Date createTime;
private static final long serialVersionUID = 1L;
}

46
src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java
Unescape Escape View File

@ -43,7 +43,7 @@ public class DeviceRepairOrderEntity {
private String code;
/**
* 状态（0：新增；1：未审核；2：已审核）
* 状态（0：新增；1：未审核；2：已审核；3。已处理）
*/
@TableField(value = "`status`")
private Integer status;
@ -90,4 +90,46 @@ public class DeviceRepairOrderEntity {
@TableField(value = "remark")
private String remark;
}
// ----------------------新增字段=-------------------------------
/**
* 维修类型 1:自行维修；2：外部维修
*/
private String repairType;
/**
* 紧急类型 1,正常；2,较急；3,特急
*/
private Integer urgencyType;
/**
* 计划完成日期
*/
private Date planTime;
/**
* 报修图片
*/
private String uploadImage;
/**
* 维修人
*/
private String repariName;
/**
* 维修开始时间
*/
private String repariStartTime;
/**
* 维修结束时间
*/
private String repariEndTime;
/**
* 维修说明
*/
private String repariRemark;
/**
* 维修图片
*/
private String repariImage;
}

7
src/main/java/com/glxp/api/req/inout/UpdateReceiveDetailRequest.java
Unescape Escape View File

@ -1,10 +1,7 @@
package com.glxp.api.req.inout;
import com.glxp.api.entity.inout.PurReceiveEntity;
import lombok.Data;
import java.util.List;
@Data
public class UpdateReceiveDetailRequest {
@ -38,4 +35,8 @@ public class UpdateReceiveDetailRequest {
private String expireDate;
private Integer advanceType;
private String targetInvCode;
}

12
src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java
Unescape Escape View File

@ -0,0 +1,12 @@
package com.glxp.api.service.inv;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.entity.inv.DeviceInspectTaskDetail;
import com.glxp.api.dao.inv.DeviceInspectTaskDetailMapper;
@Service
public class DeviceInspectTaskDetailService extends ServiceImpl<DeviceInspectTaskDetailMapper, DeviceInspectTaskDetail> {
}

12
src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java
Unescape Escape View File

@ -0,0 +1,12 @@
package com.glxp.api.service.inv;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.dao.inv.DeviceInspectTaskMapper;
import com.glxp.api.entity.inv.DeviceInspectTask;
@Service
public class DeviceInspectTaskService extends ServiceImpl<DeviceInspectTaskMapper, DeviceInspectTask> {
}

12
src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java
Unescape Escape View File

@ -0,0 +1,12 @@
package com.glxp.api.service.inv;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.glxp.api.entity.inv.DeviceProjectSet;
import com.glxp.api.dao.inv.DeviceProjectSetMapper;
@Service
public class DeviceProjectSetService extends ServiceImpl<DeviceProjectSetMapper, DeviceProjectSet> {
}

6
src/main/java/com/glxp/api/service/inv/InvPreProductService.java
Unescape Escape View File

@ -1,12 +1,8 @@
package com.glxp.api.service.inv;
import com.glxp.api.entity.inv.InvPreProductEntity;
import com.glxp.api.entity.inv.InvProductDetailEntity;
import com.glxp.api.entity.inv.InvProductEntity;
import com.glxp.api.req.inv.FilterInvPreProductRequest;
import com.glxp.api.req.inv.FilterInvProductRequest;
import com.glxp.api.res.inv.InvPreProductResponse;
import com.glxp.api.res.inv.InvProductResponse;
import java.util.List;
@ -32,6 +28,8 @@ public interface InvPreProductService {
*/
List<InvPreProductResponse> filterList(FilterInvPreProductRequest invPreProductRequest);
List<InvPreProductResponse> filterListStock(FilterInvPreProductRequest invPreProductRequest);
List<InvPreProductResponse> findGroupBySpace(FilterInvPreProductRequest invPreProductRequest);

5
src/main/java/com/glxp/api/service/inv/InvPreinProductService.java
Unescape Escape View File

@ -1,9 +1,7 @@
package com.glxp.api.service.inv;
import com.glxp.api.entity.inv.InvPreinProductEntity;
import com.glxp.api.req.inv.FilterInvPreProductRequest;
import com.glxp.api.req.inv.FilterInvPreinProductRequest;
import com.glxp.api.res.inv.InvPreProductResponse;
import com.glxp.api.res.inv.InvPreinProductResponse;
import java.util.List;
@ -30,6 +28,9 @@ public interface InvPreinProductService {
*/
List<InvPreinProductResponse> filterList(FilterInvPreinProductRequest filterInvPreinDetailRequest);
List<InvPreinProductResponse> filterListStock(FilterInvPreinProductRequest filterInvPreinDetailRequest);
/**
* 查询寄售库存列表
*

8
src/main/java/com/glxp/api/service/inv/InvProductService.java
Unescape Escape View File

@ -25,6 +25,14 @@ public interface InvProductService {
*/
List<InvProductResponse> filterList(FilterInvProductRequest filterInvProductRequest);
/**
* 库存查询过滤零库存和负库存
*
* @param filterInvProductRequest
* @return
*/
List<InvProductResponse> filterListStock(FilterInvProductRequest filterInvProductRequest);
/**
* 库存查询
*

12
src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java
Unescape Escape View File

@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.inv.InvPreProductDao;
import com.glxp.api.entity.inv.InvPreProductEntity;
import com.glxp.api.entity.inv.InvProductEntity;
import com.glxp.api.req.inv.FilterInvPreProductRequest;
import com.glxp.api.res.inv.InvPreProductResponse;
import com.glxp.api.service.inv.InvPreProductService;
@ -58,6 +57,17 @@ public class InvPreProductServiceImpl implements InvPreProductService {
return invPreProductDao.filterList(invPreProductRequest);
}
@Override
public List<InvPreProductResponse> filterListStock(FilterInvPreProductRequest invPreProductRequest) {
if (null == invPreProductRequest) {
return Collections.emptyList();
}
if (null != invPreProductRequest.getPage()) {
PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit());
}
return invPreProductDao.filterListStock(invPreProductRequest);
}
@Override
public List<InvPreProductResponse> findGroupBySpace(FilterInvPreProductRequest invPreProductRequest) {
if (null == invPreProductRequest) {

12
src/main/java/com/glxp/api/service/inv/impl/InvPreinProductServiceImpl.java
Unescape Escape View File

@ -57,6 +57,17 @@ public class InvPreinProductServiceImpl implements InvPreinProductService {
return invPreinProductDao.filterList(invPreProductRequest);
}
@Override
public List<InvPreinProductResponse> filterListStock(FilterInvPreinProductRequest invPreProductRequest) {
if (null == invPreProductRequest) {
return Collections.emptyList();
}
if (null != invPreProductRequest.getPage()) {
PageHelper.offsetPage((invPreProductRequest.getPage() - 1) * invPreProductRequest.getLimit(), invPreProductRequest.getLimit());
}
return invPreinProductDao.filterListStock(invPreProductRequest);
}
@Override
public List<InvPreinProductEntity> filterPreinProductList(FilterInvPreinProductRequest invPreProductRequest) {
if (null == invPreProductRequest) {
@ -79,6 +90,7 @@ public class InvPreinProductServiceImpl implements InvPreinProductService {
return invPreinProductDao.findGroupBySpace(invPreProductRequest);
}
@Override
public InvPreinProductEntity findById(String id) {
return invPreinProductDao.selectById(id);

11
src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java
Unescape Escape View File

@ -58,6 +58,17 @@ public class InvProductServiceImpl implements InvProductService {
return invProductDao.filterProductList(filterInvProductRequest);
}
@Override
public List<InvProductResponse> filterListStock(FilterInvProductRequest filterInvProductRequest) {
if (null == filterInvProductRequest) {
return Collections.emptyList();
}
if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
}
return invProductDao.filterProductListStock(filterInvProductRequest);
}
@Override
public List<InvProductResponse> filterListProduct(FilterInvProductRequest filterInvProductRequest) {

9
src/main/java/com/glxp/api/service/sync/HeartService.java
Unescape Escape View File

@ -1294,7 +1294,6 @@ public class HeartService {
if (CollUtil.isNotEmpty(syncDataResponse.getDeptUserEntities()))
logs = logs + "部门用户信息：" + syncDataResponse.getDeptUserEntities().size() + "条\n";
if (CollUtil.isNotEmpty(syncDataResponse.getInvSpaces()))
logs = logs + "货位信息：" + syncDataResponse.getInvSpaces().size() + "条\n";
@ -1341,10 +1340,6 @@ public class HeartService {
for (IoOrderEntity orderEntity : orderEntities) {
SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2);
orderEntity.setUpdateTime(null);
orderEntity.setFromType(ConstantStatus.FROM_UDISP);
orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
if (syncDataBustypeEntity != null) {
if (syncDataBustypeEntity.getSyncStatus() != null && syncDataBustypeEntity.getSyncStatus().compareTo(1) == 0) {
orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_DRAFT);
@ -1356,6 +1351,10 @@ public class HeartService {
}
IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo());
if (temp == null) {
orderEntity.setFromType(ConstantStatus.FROM_UDISP);
orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);
orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);
orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
orderEntity.setId(null);
orderService.insertOrder(orderEntity);
insetOrderDb(syncDataResponse, orderEntity);

22
src/main/resources/mybatis/mapper/inv/DeviceInspectTaskDetailMapper.xml
Unescape Escape View File

@ -0,0 +1,22 @@
<?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.DeviceInspectTaskDetailMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceInspectTaskDetail">
<!--@mbg.generated-->
<!--@Table device_inspect_task_detail-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="projectCode" jdbcType="VARCHAR" property="projectCode" />
<result column="projectContent" jdbcType="VARCHAR" property="projectContent" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="result" jdbcType="VARCHAR" property="result" />
<result column="inspectImage" jdbcType="VARCHAR" property="inspectImage" />
<result column="inspectUser" jdbcType="VARCHAR" property="inspectUser" />
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
<result column="taskOrderIdFk" jdbcType="VARCHAR" property="taskOrderIdFk" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, projectCode, projectContent, `status`, `result`, inspectImage, inspectUser, updateTime,
taskOrderIdFk
</sql>
</mapper>

27
src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml
Unescape Escape View File

@ -0,0 +1,27 @@
<?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.DeviceInspectTaskMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceInspectTask">
<!--@mbg.generated-->
<!--@Table device_inspect_task-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="orderId" jdbcType="VARCHAR" property="orderId" />
<result column="planOrderIdFk" jdbcType="VARCHAR" property="planOrderIdFk" />
<result column="deptCode" jdbcType="VARCHAR" property="deptCode" />
<result column="invCode" jdbcType="VARCHAR" property="invCode" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="inspectUser" jdbcType="VARCHAR" property="inspectUser" />
<result column="remindTime" jdbcType="TIMESTAMP" property="remindTime" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="strartTime" jdbcType="TIMESTAMP" property="strartTime" />
<result column="endTime" jdbcType="TIMESTAMP" property="endTime" />
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, orderId, planOrderIdFk, deptCode, invCode, code, `status`, inspectUser, remindTime,
remark, strartTime, endTime, createTime, updateTime
</sql>
</mapper>

21
src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml
Unescape Escape View File

@ -0,0 +1,21 @@
<?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.DeviceProjectSetMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inv.DeviceProjectSet">
<!--@mbg.generated-->
<!--@Table device_project_set-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="content" jdbcType="VARCHAR" property="content" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="remak" jdbcType="VARCHAR" property="remak" />
<result column="udpateTime" jdbcType="TIMESTAMP" property="udpateTime" />
<result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, code, content, `type`, remak, udpateTime, updateUser, `createUser`, createTime
</sql>
</mapper>

82
src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml
Unescape Escape View File

@ -80,6 +80,86 @@
group by ipp.id
</select>
<select id="filterListStock" resultType="com.glxp.api.res.inv.InvPreProductResponse">
select ipp.id,
ipp.nameCode,
bp.cpmctymc,
ipp.relIdFk,
bp.ggxh,
ipp.batchNo,
ipp.productionDate,
ipp.expireDate,
bp.ylqxzcrbarmc,
bp.zczbhhzbapzbh,
ipp.inCount,
ipp.outCount,
ipp.reCount,
ipp.customerId,
basic_corp.name supName,
ipp.supId,
auth_dept.name deptName,
auth_warehouse.name invName,
ipp.deptCode,
ipp.invCode,
bp.measname
from inv_pre_product ipp
inner join basic_udirel on ipp.relIdFk = basic_udirel.id
inner join basic_products bp on basic_udirel.uuid = bp.uuid
left join basic_corp on ipp.supId = basic_corp.erpId
left join auth_dept on auth_dept.code = ipp.deptCode
left join auth_warehouse on auth_warehouse.code = ipp.invCode
<where>
bp.diType = 1
and ipp.reCount > 0
<if test="cpmctymc != null and cpmctymc != ''">
AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
</if>
<if test="nameCode != null and nameCode != ''">
AND ipp.nameCode like concat('%', #{nameCode}, '%')
</if>
<if test="relIdFk != null and relIdFk != ''">
AND ipp.relIdFk = #{relIdFk}
</if>
<if test="ggxh != null and ggxh != ''">
AND bp.ggxh like concat('%', #{ggxh}, '%')
</if>
<if test="batchNo != null and batchNo != ''">
AND ipp.batchNo like concat('%', #{batchNo}, '%')
</if>
<if test="productionDate != null and productionDate != ''">
AND ipp.productionDate = #{productionDate}
</if>
<if test="expireDate != null and expireDate != ''">
AND ipp.expireDate = #{expireDate}
</if>
<if test="ylqxzcrbarmc != null and ylqxzcrbarmc != ''">
AND bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%')
</if>
<if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
</if>
<if test="customerId != null and customerId != ''">
AND ipp.customerId = #{customerId}
</if>
<if test="supId != null and supId != ''">
AND ipp.supId = #{supId}
</if>
<if test="deptCode != null and deptCode != ''">
AND ipp.deptCode = #{deptCode}
</if>
<if test="invCode != null and invCode != ''">
AND ipp.invCode = #{invCode}
</if>
<if test="invCodes != null and invCodes.size() != 0">
AND ipp.invCode in
<foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
group by ipp.id
</select>
<select id="filterPreProductList" resultType="com.glxp.api.entity.inv.InvPreProductEntity">
select ipp.*
from inv_pre_product ipp
@ -138,7 +218,7 @@
</where>
</select>
<select id="findGroupBySpace" resultType="com.glxp.api.res.inv.InvProductResponse">
<select id="findGroupBySpace" resultType="com.glxp.api.res.inv.InvPreProductResponse">
select
ipp.id,
ipp.nameCode,

79
src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml
Unescape Escape View File

@ -79,6 +79,85 @@
group by ipp.id
</select>
<select id="filterListStock" resultType="com.glxp.api.res.inv.InvPreinProductResponse">
select ipp.id,
ipp.nameCode,
bp.cpmctymc,
ipp.relIdFk,
bp.ggxh,
bp.measname,
ipp.batchNo,
ipp.productionDate,
ipp.expireDate,
bp.ylqxzcrbarmc,
bp.zczbhhzbapzbh,
ipp.inCount,
ipp.outCount,
ipp.reCount,
ipp.customerId,
basic_corp.name supName,
ipp.supId,
auth_dept.name deptName,
auth_warehouse.name invName,
ipp.deptCode,
ipp.invCode
from inv_prein_product ipp
inner join basic_udirel on ipp.relIdFk = basic_udirel.id
inner join basic_products bp on basic_udirel.uuid = bp.uuid
left join basic_corp on ipp.supId = basic_corp.erpId
left join auth_dept on auth_dept.code = ipp.deptCode
left join auth_warehouse on auth_warehouse.code = ipp.invCode
<where>
ipp.reCount > 0
<if test="cpmctymc != null and cpmctymc != ''">
AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
</if>
<if test="nameCode != null and nameCode != ''">
AND ipp.nameCode like concat('%', #{nameCode}, '%')
</if>
<if test="relIdFk != null and relIdFk != ''">
AND ipp.relIdFk = #{relIdFk}
</if>
<if test="ggxh != null and ggxh != ''">
AND bp.ggxh like concat('%', #{ggxh}, '%')
</if>
<if test="batchNo != null and batchNo != ''">
AND ipp.batchNo like concat('%', #{batchNo}, '%')
</if>
<if test="productionDate != null and productionDate != ''">
AND ipp.productionDate = #{productionDate}
</if>
<if test="expireDate != null and expireDate != ''">
AND ipp.expireDate = #{expireDate}
</if>
<if test="ylqxzcrbarmc != null and ylqxzcrbarmc != ''">
AND bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%')
</if>
<if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
</if>
<if test="customerId != null and customerId != ''">
AND ipp.customerId = #{customerId}
</if>
<if test="supId != null and supId != ''">
AND ipp.supId = #{supId}
</if>
<if test="deptCode != null and deptCode != ''">
AND ipp.deptCode = #{deptCode}
</if>
<if test="invCode != null and invCode != ''">
AND ipp.invCode = #{invCode}
</if>
<if test="invCodes != null and invCodes.size() != 0">
AND ipp.invCode in
<foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
</where>
group by ipp.id
</select>
<select id="filterPreProductList" resultType="com.glxp.api.entity.inv.InvPreinProductEntity">
select ipp.*
from inv_prein_product ipp

90
src/main/resources/mybatis/mapper/inv/invProductDao.xml
Unescape Escape View File

@ -382,4 +382,94 @@
group by ip.relIdFk
order by ip.updateTime desc
</select>
<select id="filterProductListStock" resultType="com.glxp.api.res.inv.InvProductResponse"
parameterType="com.glxp.api.req.inv.FilterInvProductRequest">
select ip.id,
ip.nameCode,
bp.cpmctymc,
ip.relIdFk,
bp.ggxh,
ip.batchNo,
ip.productionDate,
ip.expireDate,
bp.ylqxzcrbarmc,
bp.zczbhhzbapzbh,
sum(ip.inCount) as inCount,
sum(ip.outCount) as outCount,
sum(ip.reCount) as reCount,
ip.customerId,
basic_corp.name supName,
ip.supId,
auth_dept.name deptName,
auth_warehouse.name invName,
ip.deptCode,
ip.invCode
from inv_product ip
inner join basic_udirel on ip.relIdFk = basic_udirel.id
inner join basic_products bp on basic_udirel.uuid = bp.uuid
left join basic_corp on ip.supId = basic_corp.erpId
left join auth_dept on auth_dept.code = ip.deptCode
left join auth_warehouse on auth_warehouse.code = ip.invCode
left join inv_product_detail ipd on ip.invCode = ipd.invCode and ip.relIdFk = ipd.relId and
ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
<where>
bp.diType = 1
<if test="cpmctymc != null and cpmctymc != ''">
AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
</if>
<if test="nameCode != null and nameCode != ''">
AND ip.nameCode like concat('%', #{nameCode}, '%')
</if>
<if test="relIdFk != null and relIdFk != ''">
AND ip.relIdFk = #{relIdFk}
</if>
<if test="ggxh != null and ggxh != ''">
AND bp.ggxh like concat('%', #{ggxh}, '%')
</if>
<if test="batchNo != null and batchNo != ''">
AND ip.batchNo like concat('%', #{batchNo}, '%')
</if>
<if test="productionDate != null and productionDate != ''">
AND ip.productionDate = #{productionDate}
</if>
<if test="expireDate != null and expireDate != ''">
AND ip.expireDate = #{expireDate}
</if>
<if test="ylqxzcrbarmc != null and ylqxzcrbarmc != ''">
AND bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%')
</if>
<if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
</if>
<if test="customerId != null and customerId != ''">
AND ip.customerId = #{customerId}
</if>
<if test="supId != null and supId != ''">
AND ip.supId = #{supId}
</if>
<if test="deptCode != null and deptCode != ''">
AND ip.deptCode = #{deptCode}
</if>
<if test="invCode != null and invCode != ''">
AND ip.invCode = #{invCode}
</if>
<if test="invCodes != null and invCodes.size() != 0">
AND ip.invCode in
<foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="supName != null and supName != ''">
AND basic_corp.name like concat('%', #{supName}, '%')
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND ipd.invSpaceCode = #{invSpaceCode}
</if>
</where>
group by ip.relIdFk
having reCount >0
order by ip.updateTime desc
</select>
</mapper>

85
src/main/resources/schemas/schema_v2.2.sql
Unescape Escape View File

@ -0,0 +1,85 @@
# 字段新增 （表名，字段名，字段类型，修改方式（1：新增，2：修改，3：删除）
CREATE TABLE IF NOT EXISTS `device_inspect_task`
(
`id` int NOT NULL AUTO_INCREMENT,
`orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '任务单号',
`planOrderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检计划单号（外键）',
`deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门',
`invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库',
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '资产编码',
`status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '状态',
`inspectUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检人',
`remindTime` datetime(0) NULL DEFAULT NULL COMMENT '提醒时间',
`remark` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检备注',
`strartTime` datetime(0) NULL DEFAULT NULL COMMENT '任务开始时间',
`endTime` datetime(0) NULL DEFAULT NULL COMMENT '任务结束时间',
`createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci
ROW_FORMAT = Dynamic;
-- ----------------------------
-- Table structure for device_inspect_task_detail
-- ----------------------------
CREATE TABLE IF NOT EXISTS `device_inspect_task_detail`
(
`id` int NOT NULL AUTO_INCREMENT,
`projectCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检项目编码',
`projectContent` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检内容',
`status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '状态（1：未开始；2：已检查；3：异常；4：不巡检',
`result` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检结果备注',
`inspectImage` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检图片',
`inspectUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检人',
`updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
`taskOrderIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '巡检任务ID外键',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci
ROW_FORMAT = Dynamic;
-- ----------------------------
-- Table structure for device_project_set
-- ----------------------------
CREATE TABLE IF NOT EXISTS `device_project_set`
(
`id` int NOT NULL AUTO_INCREMENT,
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目编号',
`content` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '项目内容',
`type` int NULL DEFAULT NULL COMMENT '项目类型：1：巡检；2：养护',
`remak` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
`udpateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
`updateUser` varchar(0) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
`createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
`createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci
ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1;
CALL Pro_Temp_ColumnWork('device_repair_order', 'repairType', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'urgencyType', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'planTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'uploadImage', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'repariName', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'reparistartTime', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'repariEndTime', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'repariRemark', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_repair_order', 'repariImage', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'startTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'endTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'frequency', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'frequencyUnit', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'planStatus', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'inspectUser', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'lastTime', 'datetime', 1);
CALL Pro_Temp_ColumnWork('device_inspect_plan', 'nextTime', 'datetime', 1);
Write Preview
Loading…
Cancel
Save