Merge branch 'dev' into dev_ywj
# Conflicts: # src/main/java/com/glxp/api/constant/Constant.java # src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java # src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java # src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java # src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java # src/main/java/com/glxp/api/service/sync/HeartService.java # src/main/java/com/glxp/api/task/SyncHeartTask.java # src/main/java/com/glxp/api/task/SyncThirdSysTask.java # src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java # src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xmldev
anthonywj
2 years ago
commit
8d377e8839
@ -0,0 +1,139 @@
|
||||
package com.glxp.api.controller.inout;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
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.entity.inout.IoDestinyProcessDetailEntity;
|
||||
import com.glxp.api.req.basic.FilterUdiRelRequest;
|
||||
import com.glxp.api.req.inout.IodestinyProcessRequest;
|
||||
import com.glxp.api.res.PageSimpleResponse;
|
||||
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
||||
import com.glxp.api.res.inout.IoCodeRelResponse;
|
||||
import com.glxp.api.res.inout.IodestinyProcessResponse;
|
||||
import com.glxp.api.service.basic.BasicDestinyRelService;
|
||||
import com.glxp.api.service.inout.IoDestinyProcessCodeService;
|
||||
import com.glxp.api.service.inout.IoDestinyProcessDetailService;
|
||||
import com.glxp.api.service.inout.IoDestinyProcessService;
|
||||
import org.springframework.validation.BindingResult;
|
||||
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.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
public class IoDestinyProcessController {
|
||||
|
||||
@Resource
|
||||
private BasicDestinyRelService basicDestinyRelService;
|
||||
@Resource
|
||||
private IoDestinyProcessDetailService ioDestinyProcessDetailService;
|
||||
@Resource
|
||||
private IoDestinyProcessCodeService ioDestinyProcessCodeService;
|
||||
@Resource
|
||||
private IoDestinyProcessService ioDestinyProcessService;
|
||||
|
||||
|
||||
@PostMapping("/udiwms/basic/destiny/model/addDestinyDelect")
|
||||
public BaseResponse addDestinyDelect(@RequestBody FilterUdiRelRequest filterUdiRelRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
ioDestinyProcessDetailService.insertProcessDetail(filterUdiRelRequest);
|
||||
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
@GetMapping("/udiwms/basic/destiny/model/filterDestinyProcessDelect")
|
||||
public BaseResponse filterDestinyProcessDelect(FilterUdiRelRequest filterUdiRelRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<UdiRelevanceResponse> udiRelevanceResponseList = ioDestinyProcessDetailService.filterProcessDetail(filterUdiRelRequest);
|
||||
|
||||
return ResultVOUtils.success(udiRelevanceResponseList);
|
||||
}
|
||||
|
||||
@GetMapping("/udiwms/basic/destiny/model/filterDestinyProcess")
|
||||
public BaseResponse filterDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<IodestinyProcessResponse> iodestinyProcessResponseList = ioDestinyProcessDetailService.filterDestinyProcess(iodestinyProcessRequest);
|
||||
PageInfo<IodestinyProcessResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(iodestinyProcessResponseList);
|
||||
PageSimpleResponse<IodestinyProcessResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(iodestinyProcessResponseList);
|
||||
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("/udiwms/basic/destiny/model/checkDestinyProcess")
|
||||
public BaseResponse checkDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
BaseResponse baseResponse = ioDestinyProcessDetailService.checkDestinyProcess(iodestinyProcessRequest);
|
||||
|
||||
|
||||
return baseResponse;
|
||||
}
|
||||
|
||||
@GetMapping("/udiwms/basic/destiny/model/filterDestinyProcessCode")
|
||||
public BaseResponse filterDestinyProcessCode(IodestinyProcessRequest iodestinyProcessRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<IodestinyProcessResponse> iodestinyProcessResponseList = ioDestinyProcessCodeService.filterDestinyProcessCode(iodestinyProcessRequest);
|
||||
PageInfo<IodestinyProcessResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(iodestinyProcessResponseList);
|
||||
PageSimpleResponse<IodestinyProcessResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(iodestinyProcessResponseList);
|
||||
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@GetMapping("/udiwms/basic/destiny/model/addDestinyProcess")
|
||||
public BaseResponse addDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<IoDestinyProcessDetailEntity> ioDestinyProcessDetailEntityList= ioDestinyProcessDetailService.addDestinyProcess(iodestinyProcessRequest);
|
||||
|
||||
for (IoDestinyProcessDetailEntity ioDestinyProcessDetailEntity : ioDestinyProcessDetailEntityList) {
|
||||
if(ioDestinyProcessDetailEntity.getCount()-ioDestinyProcessDetailEntity.getReCount()>0){
|
||||
return ResultVOUtils.error(999,"该单还未完全扫码校验！");
|
||||
}
|
||||
}
|
||||
//更新状态
|
||||
ioDestinyProcessService.uploadDestinyProcess(iodestinyProcessRequest);
|
||||
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
@GetMapping("/udiwms/basic/destiny/model/delectDestinyProcess")
|
||||
public BaseResponse delectDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest, BindingResult bindingResult) {
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
//更新状态
|
||||
ioDestinyProcessService.delectDestinyProcess(iodestinyProcessRequest);
|
||||
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package com.glxp.api.dao.basic;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.dao.BaseMapperPlus;
|
||||
import com.glxp.api.entity.basic.BasicCorpEntity;
|
||||
import com.glxp.api.entity.basic.BasicDestinyRelEntity;
|
||||
import com.glxp.api.req.basic.FilterUdiRelRequest;
|
||||
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface BasicDestinyRelMapper extends BaseMapperPlus<BasicDestinyRelMapper, BasicDestinyRelEntity, BasicDestinyRelEntity> {
|
||||
|
||||
List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
|
||||
|
||||
List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.glxp.api.dao.inout;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.inout.IoDestinyProcessCodeEntity;
|
||||
import com.glxp.api.req.inout.IodestinyProcessRequest;
|
||||
import com.glxp.api.res.inout.IodestinyProcessResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface IoDestinyProcessCodeMapper extends BaseMapper<IoDestinyProcessCodeEntity> {
|
||||
|
||||
List<IodestinyProcessResponse> filterDestinyProcessCode(IodestinyProcessRequest iodestinyProcessRequest);
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
package com.glxp.api.dao.inout;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.dao.BaseMapperPlus;
|
||||
import com.glxp.api.entity.inout.IoCodeTempEntity;
|
||||
import com.glxp.api.entity.inout.IoDestinyProcessDetailEntity;
|
||||
import com.glxp.api.req.basic.FilterUdiRelRequest;
|
||||
import com.glxp.api.req.inout.IodestinyProcessRequest;
|
||||
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
||||
import com.glxp.api.res.inout.IodestinyProcessResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface IoDestinyProcessDetailMapper extends BaseMapperPlus<IoDestinyProcessDetailMapper, IoDestinyProcessDetailEntity, IoDestinyProcessDetailEntity> {
|
||||
|
||||
List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest);
|
||||
|
||||
List<IodestinyProcessResponse> filterDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.glxp.api.dao.inout;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.inout.IoDestinyProcessEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface IoDestinyProcessMapper extends BaseMapper<IoDestinyProcessEntity> {
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package com.glxp.api.entity.basic;
|
||||
|
||||
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;
|
||||
|
||||
/**
|
||||
* 定数包产品关联表
|
||||
*/
|
||||
@Data
|
||||
@TableName(value = "udi_wms.basic_destiny_rel")
|
||||
public class BasicDestinyRelEntity {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 耗材产品id
|
||||
*/
|
||||
@TableField(value = "relId")
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 定数包模板id
|
||||
*/
|
||||
@TableField(value = "pId")
|
||||
private Long pId;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
}
|
||||
@ -0,0 +1,93 @@
|
||||
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.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 定速包加工明细表
|
||||
*/
|
||||
@Data
|
||||
@TableName(value = "io_destiny_process_code")
|
||||
public class IoDestinyProcessCodeEntity {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 订单号外键
|
||||
*/
|
||||
@TableField(value = "orderIdFk")
|
||||
private String orderIdFk;
|
||||
|
||||
/**
|
||||
* 耗材字典ID外键
|
||||
*/
|
||||
@TableField(value = "bindRlFk")
|
||||
private String bindRlFk;
|
||||
|
||||
/**
|
||||
* DI信息UUID外键
|
||||
*/
|
||||
@TableField(value = "uuidFk")
|
||||
private String uuidFk;
|
||||
|
||||
/**
|
||||
* DI
|
||||
*/
|
||||
@TableField(value = "nameCode")
|
||||
private String nameCode;
|
||||
|
||||
/**
|
||||
* 批次号
|
||||
*/
|
||||
@TableField(value = "batchNo")
|
||||
private String batchNo;
|
||||
|
||||
/**
|
||||
* 生产日期
|
||||
*/
|
||||
@TableField(value = "productDate")
|
||||
private String productDate;
|
||||
|
||||
/**
|
||||
* 失效日期
|
||||
*/
|
||||
@TableField(value = "expireDate")
|
||||
private String expireDate;
|
||||
|
||||
/**
|
||||
* 价格
|
||||
*/
|
||||
@TableField(value = "price")
|
||||
private BigDecimal price;
|
||||
|
||||
/**
|
||||
* 供应商ID外键
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private String supId;
|
||||
|
||||
/**
|
||||
* 单据数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
@TableField(value = "code")
|
||||
private String code;
|
||||
|
||||
|
||||
@TableField(value = "serialNo")
|
||||
private String serialNo;
|
||||
|
||||
@TableField(value = "reCount")
|
||||
private int reCount;
|
||||
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
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 lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 定数包产品关联表
|
||||
*/
|
||||
@Data
|
||||
@TableName(value = "io_destiny_process_detail")
|
||||
public class IoDestinyProcessDetailEntity {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 耗材产品id
|
||||
*/
|
||||
@TableField(value = "relId")
|
||||
private Long relId;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 实际数量
|
||||
*/
|
||||
@TableField(value = "reCount")
|
||||
private Integer reCount;
|
||||
|
||||
@TableField(value = "updateTime")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 订单号外键
|
||||
*/
|
||||
@TableField(value = "orderIdFk")
|
||||
private String orderIdFk;
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package com.glxp.api.req.basic;
|
||||
|
||||
import com.alibaba.fastjson.annotation.JSONField;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class BasicDestinyRelRequest {
|
||||
private List<Long> list;
|
||||
private Long pId;
|
||||
private Long id;
|
||||
private int count;
|
||||
public List<Long> getList() {
|
||||
return list;
|
||||
}
|
||||
|
||||
public Long getpId() {
|
||||
return pId;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.glxp.api.req.inout;
|
||||
|
||||
import com.glxp.api.util.page.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class IodestinyProcessRequest extends ListPageRequest {
|
||||
|
||||
private String billNo;
|
||||
|
||||
private String invCode;
|
||||
|
||||
private String code;
|
||||
|
||||
}
|
||||
@ -0,0 +1,101 @@
|
||||
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 com.glxp.api.util.page.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class IodestinyProcessResponse {
|
||||
|
||||
|
||||
private Long id;
|
||||
|
||||
private String destinyId;
|
||||
|
||||
private String destinyNo;
|
||||
|
||||
private String billNo;
|
||||
|
||||
private Date billDate;
|
||||
|
||||
private String invCode;
|
||||
|
||||
private String remark;
|
||||
|
||||
private Date createTime;
|
||||
|
||||
private Date updateTime;
|
||||
|
||||
private String createUser;
|
||||
|
||||
private String updateUser;
|
||||
|
||||
private Integer status;
|
||||
|
||||
private String invName;
|
||||
|
||||
private String updateName;
|
||||
private String createName;
|
||||
private String code;
|
||||
|
||||
private String serialNo;
|
||||
private String productDate;
|
||||
private String expireDate;
|
||||
private BigDecimal price;
|
||||
private String batchNo;
|
||||
private int count;
|
||||
private int reCount;
|
||||
|
||||
|
||||
|
||||
|
||||
//产品
|
||||
private String originUuid;
|
||||
private String nameCode;
|
||||
private String deviceRecordKey;
|
||||
private String packRatio;
|
||||
private String packLevel;
|
||||
private String packUnit;
|
||||
private Integer bhxjsl;
|
||||
private Integer bhzxxsbzsl;
|
||||
private Integer zxxsbzbhsydysl;
|
||||
private String bhxjcpbm;
|
||||
private String bzcj;
|
||||
private String cpmctymc;
|
||||
private String cplb;
|
||||
private String flbm;
|
||||
private String ggxh;
|
||||
private String qxlb;
|
||||
private String tyshxydm;
|
||||
private String ylqxzcrbarmc;
|
||||
private String zczbhhzbapzbh;
|
||||
private String ylqxzcrbarywmc;
|
||||
private String sydycpbs;
|
||||
private String sjcpbm;
|
||||
private Integer versionNumber;
|
||||
private Integer diType;
|
||||
private String ybbm;
|
||||
private String sptm;
|
||||
private String manufactory;
|
||||
private String measname;
|
||||
private Integer productType;
|
||||
private String scbssfbhph;
|
||||
private String scbssfbhxlh;
|
||||
private String scbssfbhscrq;
|
||||
private String scbssfbhsxrq;
|
||||
private String cpms;
|
||||
private Boolean allowNoBatch;
|
||||
private Boolean allowNoExpire;
|
||||
private Boolean allowNoProduct;
|
||||
private Boolean allowNoSerial;
|
||||
private String spmc;
|
||||
private String cplx;
|
||||
private String hchzsb;
|
||||
private String cpdls;
|
||||
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package com.glxp.api.service.basic;
|
||||
|
||||
import com.glxp.api.req.basic.BasicDestinyRelRequest;
|
||||
import com.glxp.api.req.basic.FilterUdiRelRequest;
|
||||
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface BasicDestinyRelService{
|
||||
|
||||
Boolean addModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest);
|
||||
|
||||
List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest);
|
||||
|
||||
List<Long> filterDestinyRelIds(Long pId);
|
||||
|
||||
List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest);
|
||||
|
||||
Boolean delectModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest);
|
||||
|
||||
Boolean uploadModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest);
|
||||
|
||||
}
|
||||
@ -0,0 +1,97 @@
|
||||
package com.glxp.api.service.basic.impl;
|
||||
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.basic.BasicDestinyRelMapper;
|
||||
import com.glxp.api.dao.basic.UdiRelevanceDao;
|
||||
import com.glxp.api.entity.basic.BasicDestinyRelEntity;
|
||||
import com.glxp.api.req.basic.BasicDestinyRelRequest;
|
||||
import com.glxp.api.req.basic.FilterUdiRelRequest;
|
||||
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
||||
import com.glxp.api.service.basic.BasicDestinyRelService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Service
|
||||
public class BasicDestinyRelServiceImpl implements BasicDestinyRelService {
|
||||
|
||||
@Resource
|
||||
BasicDestinyRelMapper basicDestinyRelMapper;
|
||||
|
||||
@Resource
|
||||
UdiRelevanceDao udiRelevanceDao;
|
||||
|
||||
@Override
|
||||
public Boolean addModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) {
|
||||
|
||||
List<BasicDestinyRelEntity> basicDestinyRelEntitList = new ArrayList<>();
|
||||
for (Long str : basicDestinyRelRequest.getList()) {
|
||||
BasicDestinyRelEntity basicDestinyRelEntity = new BasicDestinyRelEntity();
|
||||
basicDestinyRelEntity.setId(IdUtil.getSnowflakeNextId());
|
||||
basicDestinyRelEntity.setRelId(str);
|
||||
basicDestinyRelEntity.setPId(basicDestinyRelRequest.getpId());
|
||||
basicDestinyRelEntitList.add(basicDestinyRelEntity);
|
||||
}
|
||||
Boolean flag = basicDestinyRelMapper.insertBatch(basicDestinyRelEntitList);
|
||||
return flag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UdiRelevanceResponse> filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest) {
|
||||
if (filterUdiRelRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (filterUdiRelRequest.getPage() != null) {
|
||||
int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
|
||||
}
|
||||
List<UdiRelevanceResponse> data = basicDestinyRelMapper.filterUdiJoinSup(filterUdiRelRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Long> filterDestinyRelIds(Long pId) {
|
||||
|
||||
List<Long> stringList = new ArrayList<>();
|
||||
QueryWrapper<BasicDestinyRelEntity> ew = new QueryWrapper<>();
|
||||
ew.eq("pId", pId);
|
||||
List<BasicDestinyRelEntity> basicDestinyRelEntities = basicDestinyRelMapper.selectList(ew);
|
||||
for (BasicDestinyRelEntity basicDestinyRelEntity : basicDestinyRelEntities) {
|
||||
stringList.add(basicDestinyRelEntity.getRelId());
|
||||
}
|
||||
return stringList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UdiRelevanceResponse> filterDestinyProducts(FilterUdiRelRequest filterUdiRelRequest) {
|
||||
if (filterUdiRelRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (filterUdiRelRequest.getPage() != null) {
|
||||
int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit());
|
||||
}
|
||||
List<UdiRelevanceResponse> data = basicDestinyRelMapper.filterDestinyProducts(filterUdiRelRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean delectModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) {
|
||||
return basicDestinyRelMapper.deleteById(basicDestinyRelRequest.getId()) > 0 ? true : false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean uploadModeldestinyProduct(BasicDestinyRelRequest basicDestinyRelRequest) {
|
||||
BasicDestinyRelEntity basicDestinyRelEntity=new BasicDestinyRelEntity();
|
||||
basicDestinyRelEntity.setId(basicDestinyRelRequest.getId());
|
||||
basicDestinyRelEntity.setCount(basicDestinyRelRequest.getCount());
|
||||
return basicDestinyRelMapper.updateById(basicDestinyRelEntity)> 0 ? true : false;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
package com.glxp.api.service.inout;
|
||||
|
||||
import com.glxp.api.entity.inout.IoDestinyProcessCodeEntity;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.glxp.api.req.inout.IodestinyProcessRequest;
|
||||
import com.glxp.api.res.inout.IodestinyProcessResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IoDestinyProcessCodeService{
|
||||
|
||||
List<IodestinyProcessResponse> filterDestinyProcessCode(IodestinyProcessRequest iodestinyProcessRequest);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package com.glxp.api.service.inout;
|
||||
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.entity.inout.IoDestinyProcessDetailEntity;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.glxp.api.req.basic.FilterUdiRelRequest;
|
||||
import com.glxp.api.req.inout.IodestinyProcessRequest;
|
||||
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
||||
import com.glxp.api.res.inout.IodestinyProcessResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IoDestinyProcessDetailService{
|
||||
|
||||
Boolean insertProcessDetail(FilterUdiRelRequest filterUdiRelRequest);
|
||||
|
||||
List<IoDestinyProcessDetailEntity> addDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest);
|
||||
|
||||
List<UdiRelevanceResponse> filterProcessDetail(FilterUdiRelRequest filterUdiRelRequest);
|
||||
|
||||
List<IodestinyProcessResponse> filterDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest);
|
||||
|
||||
BaseResponse checkDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest);
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package com.glxp.api.service.inout;
|
||||
|
||||
|
||||
import com.glxp.api.req.basic.FilterUdiRelRequest;
|
||||
import com.glxp.api.req.inout.IodestinyProcessRequest;
|
||||
|
||||
public interface IoDestinyProcessService{
|
||||
|
||||
Boolean uploadDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest);
|
||||
|
||||
Boolean delectDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package com.glxp.api.service.inout.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.inout.IoDestinyProcessCodeMapper;
|
||||
import com.glxp.api.req.inout.IodestinyProcessRequest;
|
||||
import com.glxp.api.res.inout.IodestinyProcessResponse;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.glxp.api.service.inout.IoDestinyProcessCodeService;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class IoDestinyProcessCodeServiceImpl implements IoDestinyProcessCodeService {
|
||||
|
||||
@Resource
|
||||
IoDestinyProcessCodeMapper ioDestinyProcessCodeMapper;
|
||||
|
||||
@Override
|
||||
public List<IodestinyProcessResponse> filterDestinyProcessCode(IodestinyProcessRequest iodestinyProcessRequest) {
|
||||
|
||||
if (iodestinyProcessRequest.getPage() != null) {
|
||||
int offset = (iodestinyProcessRequest.getPage() - 1) * iodestinyProcessRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, iodestinyProcessRequest.getLimit());
|
||||
}
|
||||
return ioDestinyProcessCodeMapper.filterDestinyProcessCode(iodestinyProcessRequest);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,221 @@
|
||||
package com.glxp.api.service.inout.impl;
|
||||
|
||||
import cn.hutool.core.util.IdUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.dao.inout.IoDestinyProcessCodeMapper;
|
||||
import com.glxp.api.dao.inout.IoDestinyProcessMapper;
|
||||
import com.glxp.api.entity.auth.AuthAdmin;
|
||||
import com.glxp.api.entity.basic.UdiEntity;
|
||||
import com.glxp.api.entity.inout.IoDestinyProcessCodeEntity;
|
||||
import com.glxp.api.entity.inout.IoDestinyProcessEntity;
|
||||
import com.glxp.api.req.basic.FilterUdiRelRequest;
|
||||
import com.glxp.api.req.inout.IodestinyProcessRequest;
|
||||
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
||||
import com.glxp.api.res.inout.IodestinyProcessResponse;
|
||||
import com.glxp.api.service.auth.CustomerService;
|
||||
import com.glxp.api.service.basic.BasicDestinyRelService;
|
||||
import com.glxp.api.service.basic.UdiRelevanceService;
|
||||
import com.glxp.api.service.inout.IoDestinyProcessService;
|
||||
import com.glxp.api.util.udi.FilterUdiUtils;
|
||||
import com.glxp.api.util.udi.UdiCalCountUtil;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.glxp.api.dao.inout.IoDestinyProcessDetailMapper;
|
||||
import com.glxp.api.entity.inout.IoDestinyProcessDetailEntity;
|
||||
import com.glxp.api.service.inout.IoDestinyProcessDetailService;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.awt.geom.QuadCurve2D;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class IoDestinyProcessDetailServiceImpl implements IoDestinyProcessDetailService {
|
||||
|
||||
|
||||
@Resource
|
||||
private BasicDestinyRelService basicDestinyRelService;
|
||||
@Resource
|
||||
private IoDestinyProcessDetailMapper ioDestinyProcessDetailMapper;
|
||||
@Resource
|
||||
private IoDestinyProcessCodeMapper ioDestinyProcessCodeMapper;
|
||||
|
||||
@Resource
|
||||
CustomerService customerService;
|
||||
@Resource
|
||||
IoDestinyProcessMapper ioDestinyProcessMapper;
|
||||
@Resource
|
||||
UdiRelevanceService udiRelevanceService;
|
||||
@Resource
|
||||
UdiCalCountUtil udiCalCountUtil;
|
||||
|
||||
|
||||
@Override
|
||||
public Boolean insertProcessDetail(FilterUdiRelRequest filterUdiRelRequest) {
|
||||
//删除原数据
|
||||
QueryWrapper<IoDestinyProcessDetailEntity> ew=new QueryWrapper<>();
|
||||
ew.eq("orderIdFk",filterUdiRelRequest.getBillNo());
|
||||
long count= ioDestinyProcessDetailMapper.delete(ew);
|
||||
|
||||
QueryWrapper<IoDestinyProcessCodeEntity> ew1=new QueryWrapper<>();
|
||||
ew1.eq("orderIdFk",filterUdiRelRequest.getBillNo());
|
||||
ioDestinyProcessCodeMapper.delete(ew1);
|
||||
filterUdiRelRequest.setDestinyId(filterUdiRelRequest.getDestinyId());
|
||||
filterUdiRelRequest.setDiType(1);
|
||||
List<UdiRelevanceResponse> thrProductsEntities = basicDestinyRelService.filterDestinyProducts(filterUdiRelRequest);
|
||||
|
||||
AuthAdmin authAdmin= customerService.getUserBean();
|
||||
IoDestinyProcessEntity ioDestinyProcessEntity=new IoDestinyProcessEntity();
|
||||
// 插入主表
|
||||
if(count>0){
|
||||
QueryWrapper<IoDestinyProcessEntity> ew2=new QueryWrapper<>();
|
||||
ew2.eq("billNo",filterUdiRelRequest.getBillNo());
|
||||
ioDestinyProcessEntity=ioDestinyProcessMapper.selectOne(ew2);
|
||||
ioDestinyProcessEntity.setCreateTime(new Date());
|
||||
ioDestinyProcessEntity.setUpdateTime(new Date());
|
||||
ioDestinyProcessEntity.setCreateUser(authAdmin.getId() + "");
|
||||
ioDestinyProcessEntity.setUpdateUser(authAdmin.getId() + "");
|
||||
ioDestinyProcessEntity.setInvCode(filterUdiRelRequest.getInvCode());
|
||||
ioDestinyProcessEntity.setRemark(filterUdiRelRequest.getRemark());
|
||||
ioDestinyProcessMapper.updateById(ioDestinyProcessEntity);
|
||||
}else{
|
||||
ioDestinyProcessEntity.setId(IdUtil.getSnowflakeNextId());
|
||||
ioDestinyProcessEntity.setDestinyNo(filterUdiRelRequest.getDestinyNo());
|
||||
ioDestinyProcessEntity.setDestinyId(filterUdiRelRequest.getDestinyId());
|
||||
ioDestinyProcessEntity.setBillNo(filterUdiRelRequest.getBillNo());
|
||||
ioDestinyProcessEntity.setBillDate(filterUdiRelRequest.getBillDate());
|
||||
ioDestinyProcessEntity.setRemark(filterUdiRelRequest.getRemark());
|
||||
ioDestinyProcessEntity.setInvCode(filterUdiRelRequest.getInvCode());
|
||||
ioDestinyProcessEntity.setCreateTime(new Date());
|
||||
ioDestinyProcessEntity.setUpdateTime(new Date());
|
||||
ioDestinyProcessEntity.setCreateUser(authAdmin.getId() + "");
|
||||
ioDestinyProcessEntity.setUpdateUser(authAdmin.getId() + "");
|
||||
ioDestinyProcessEntity.setStatus(0);
|
||||
ioDestinyProcessMapper.insert(ioDestinyProcessEntity);
|
||||
}
|
||||
|
||||
// 插入详情表
|
||||
List<IoDestinyProcessDetailEntity> ioDestinyProcessDetailEntityList=new ArrayList<>();
|
||||
for (UdiRelevanceResponse thrProductsEntity : thrProductsEntities) {
|
||||
IoDestinyProcessDetailEntity ioDestinyProcessDetailEntity=new IoDestinyProcessDetailEntity();
|
||||
ioDestinyProcessDetailEntity.setId(IdUtil.getSnowflakeNextId());
|
||||
ioDestinyProcessDetailEntity.setCount(thrProductsEntity.getCount());
|
||||
ioDestinyProcessDetailEntity.setRelId(thrProductsEntity.getId());
|
||||
ioDestinyProcessDetailEntity.setReCount(0);
|
||||
ioDestinyProcessDetailEntity.setUpdateTime(new Date());
|
||||
ioDestinyProcessDetailEntity.setOrderIdFk(ioDestinyProcessEntity.getBillNo());
|
||||
ioDestinyProcessDetailEntityList.add(ioDestinyProcessDetailEntity);
|
||||
thrProductsEntity.setReCount(0);
|
||||
}
|
||||
ioDestinyProcessDetailMapper.insertBatch(ioDestinyProcessDetailEntityList);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<IoDestinyProcessDetailEntity> addDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest) {
|
||||
|
||||
QueryWrapper<IoDestinyProcessDetailEntity> ew=new QueryWrapper<>();
|
||||
ew.eq("orderIdFk",iodestinyProcessRequest.getBillNo());
|
||||
List<IoDestinyProcessDetailEntity> ioDestinyProcessDetailEntity=ioDestinyProcessDetailMapper.selectList(ew);
|
||||
return ioDestinyProcessDetailEntity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UdiRelevanceResponse> filterProcessDetail(FilterUdiRelRequest filterUdiRelRequest) {
|
||||
//查询详情
|
||||
List<UdiRelevanceResponse> thrProductsEntities = ioDestinyProcessDetailMapper.filterDestinyProducts(filterUdiRelRequest);
|
||||
return thrProductsEntities;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<IodestinyProcessResponse> filterDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest) {
|
||||
|
||||
if (iodestinyProcessRequest.getPage() != null) {
|
||||
int offset = (iodestinyProcessRequest.getPage() - 1) * iodestinyProcessRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, iodestinyProcessRequest.getLimit());
|
||||
}
|
||||
return ioDestinyProcessDetailMapper.filterDestinyProcess(iodestinyProcessRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BaseResponse checkDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest) {
|
||||
|
||||
UdiEntity udiEntity = FilterUdiUtils.getUdi(iodestinyProcessRequest.getCode());
|
||||
UdiRelevanceResponse checkUdi = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
|
||||
if (checkUdi ==null){
|
||||
return ResultVOUtils.error(500, "耗材字典不存在此产品！");
|
||||
}
|
||||
QueryWrapper<IoDestinyProcessDetailEntity> ew=new QueryWrapper<>();
|
||||
ew.eq("orderIdFk",iodestinyProcessRequest.getBillNo());
|
||||
ew.eq("relId",checkUdi.getRelId());
|
||||
IoDestinyProcessDetailEntity ioDestinyProcessDetailEntity=ioDestinyProcessDetailMapper.selectOne(ew);
|
||||
if(ioDestinyProcessDetailEntity == null){
|
||||
return ResultVOUtils.error(500, "定数包不存在此产品！");
|
||||
}
|
||||
if(ioDestinyProcessDetailEntity.getCount()-ioDestinyProcessDetailEntity.getReCount()<=0){
|
||||
return ResultVOUtils.error(500, "该产品已足够！");
|
||||
}
|
||||
int count = udiCalCountUtil.getActCount(udiEntity.getUdi());
|
||||
ioDestinyProcessDetailEntity.setReCount(ioDestinyProcessDetailEntity.getReCount()+count);
|
||||
ioDestinyProcessDetailMapper.updateById(ioDestinyProcessDetailEntity);
|
||||
//判断有没有序列号
|
||||
//有
|
||||
if (udiEntity.getSerialNo()!=null){
|
||||
//插入详细表
|
||||
IoDestinyProcessCodeEntity ioDestinyProcessCodeEntity=new IoDestinyProcessCodeEntity();
|
||||
ioDestinyProcessCodeEntity.setCode(iodestinyProcessRequest.getCode());
|
||||
ioDestinyProcessCodeEntity.setId(IdUtil.getSnowflakeNextId());
|
||||
ioDestinyProcessCodeEntity.setOrderIdFk(iodestinyProcessRequest.getBillNo());
|
||||
ioDestinyProcessCodeEntity.setBindRlFk(checkUdi.getRelId() + "");
|
||||
ioDestinyProcessCodeEntity.setUuidFk(checkUdi.getUuid());
|
||||
ioDestinyProcessCodeEntity.setNameCode(checkUdi.getNameCode());
|
||||
ioDestinyProcessCodeEntity.setCount(1);
|
||||
ioDestinyProcessCodeEntity.setReCount(count);
|
||||
ioDestinyProcessCodeEntity.setProductDate(udiEntity.getProduceDate());
|
||||
ioDestinyProcessCodeEntity.setExpireDate(udiEntity.getExpireDate());
|
||||
ioDestinyProcessCodeEntity.setBatchNo(udiEntity.getBatchNo());
|
||||
ioDestinyProcessCodeEntity.setPrice(checkUdi.getPrice());
|
||||
ioDestinyProcessCodeEntity.setSerialNo(udiEntity.getSerialNo());
|
||||
ioDestinyProcessCodeEntity.setUpdateTime(new Date());
|
||||
ioDestinyProcessCodeMapper.insert(ioDestinyProcessCodeEntity);
|
||||
}else{
|
||||
//无批次号的时候判断是不是第一次是第一次就插入不是第一此就更新
|
||||
QueryWrapper<IoDestinyProcessCodeEntity> ew1=new QueryWrapper<>();
|
||||
ew1.eq("code",iodestinyProcessRequest.getCode());
|
||||
ew1.eq("orderIdFk",iodestinyProcessRequest.getBillNo());
|
||||
ew1.last("limit 1");
|
||||
IoDestinyProcessCodeEntity ioDestinyProcessCodeEntity=ioDestinyProcessCodeMapper.selectOne(ew1);
|
||||
if(ioDestinyProcessCodeEntity==null){
|
||||
//插入详细表
|
||||
ioDestinyProcessCodeEntity=new IoDestinyProcessCodeEntity();
|
||||
ioDestinyProcessCodeEntity.setCode(iodestinyProcessRequest.getCode());
|
||||
ioDestinyProcessCodeEntity.setId(IdUtil.getSnowflakeNextId());
|
||||
ioDestinyProcessCodeEntity.setOrderIdFk(iodestinyProcessRequest.getBillNo());
|
||||
ioDestinyProcessCodeEntity.setBindRlFk(checkUdi.getRelId() + "");
|
||||
ioDestinyProcessCodeEntity.setUuidFk(checkUdi.getUuid());
|
||||
ioDestinyProcessCodeEntity.setNameCode(checkUdi.getNameCode());
|
||||
ioDestinyProcessCodeEntity.setCount(1);
|
||||
ioDestinyProcessCodeEntity.setReCount(count);
|
||||
ioDestinyProcessCodeEntity.setProductDate(udiEntity.getProduceDate());
|
||||
ioDestinyProcessCodeEntity.setExpireDate(udiEntity.getExpireDate());
|
||||
ioDestinyProcessCodeEntity.setBatchNo(udiEntity.getBatchNo());
|
||||
ioDestinyProcessCodeEntity.setPrice(checkUdi.getPrice());
|
||||
ioDestinyProcessCodeEntity.setSerialNo(udiEntity.getSerialNo());
|
||||
ioDestinyProcessCodeEntity.setUpdateTime(new Date());
|
||||
ioDestinyProcessCodeMapper.insert(ioDestinyProcessCodeEntity);
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
ioDestinyProcessCodeEntity.setCount(ioDestinyProcessCodeEntity.getReCount()+1);
|
||||
ioDestinyProcessCodeEntity.setReCount(ioDestinyProcessCodeEntity.getReCount()+count);
|
||||
ioDestinyProcessCodeMapper.updateById(ioDestinyProcessCodeEntity);
|
||||
|
||||
}
|
||||
return ResultVOUtils.success();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package com.glxp.api.service.inout.impl;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.glxp.api.dao.inout.IoDestinyProcessCodeMapper;
|
||||
import com.glxp.api.dao.inout.IoDestinyProcessDetailMapper;
|
||||
import com.glxp.api.dao.inout.IoDestinyProcessMapper;
|
||||
import com.glxp.api.entity.inout.IoDestinyProcessCodeEntity;
|
||||
import com.glxp.api.entity.inout.IoDestinyProcessDetailEntity;
|
||||
import com.glxp.api.entity.inout.IoDestinyProcessEntity;
|
||||
import com.glxp.api.req.inout.IodestinyProcessRequest;
|
||||
import com.glxp.api.service.inout.IoDestinyProcessService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@Service
|
||||
public class IoDestinyProcessServiceImpl implements IoDestinyProcessService {
|
||||
@Resource
|
||||
IoDestinyProcessMapper ioDestinyProcessMapper;
|
||||
@Resource
|
||||
private IoDestinyProcessDetailMapper ioDestinyProcessDetailMapper;
|
||||
@Resource
|
||||
private IoDestinyProcessCodeMapper ioDestinyProcessCodeMapper;
|
||||
|
||||
@Override
|
||||
public Boolean uploadDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest) {
|
||||
|
||||
QueryWrapper<IoDestinyProcessEntity> ew = new QueryWrapper<>();
|
||||
ew.eq("billNo", iodestinyProcessRequest.getBillNo());
|
||||
IoDestinyProcessEntity ioDestinyProcessEntity = ioDestinyProcessMapper.selectOne(ew);
|
||||
ioDestinyProcessEntity.setStatus(2);
|
||||
ioDestinyProcessMapper.updateById(ioDestinyProcessEntity);
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Boolean delectDestinyProcess(IodestinyProcessRequest iodestinyProcessRequest) {
|
||||
|
||||
|
||||
QueryWrapper<IoDestinyProcessDetailEntity> ew=new QueryWrapper<>();
|
||||
ew.eq("orderIdFk",iodestinyProcessRequest.getBillNo());
|
||||
long count= ioDestinyProcessDetailMapper.delete(ew);
|
||||
|
||||
QueryWrapper<IoDestinyProcessCodeEntity> ew1=new QueryWrapper<>();
|
||||
ew1.eq("orderIdFk",iodestinyProcessRequest.getBillNo());
|
||||
ioDestinyProcessCodeMapper.delete(ew1);
|
||||
|
||||
QueryWrapper<IoDestinyProcessEntity> ew3 = new QueryWrapper<>();
|
||||
ew3.eq("billNo", iodestinyProcessRequest.getBillNo());
|
||||
ioDestinyProcessMapper.delete(ew3);
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,303 @@
|
||||
<?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.basic.BasicDestinyRelMapper">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.basic.BasicDestinyRelEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table udi_wms.basic_destiny_rel-->
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="relId" jdbcType="BIGINT" property="relId" />
|
||||
<result column="pId" jdbcType="BIGINT" property="pId" />
|
||||
<result column="count" jdbcType="INTEGER" property="count" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, relId, pId, `count`
|
||||
</sql>
|
||||
|
||||
|
||||
<select id="filterUdiJoinSup" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
|
||||
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
|
||||
select basic_udirel.*,
|
||||
basic_products.id as PRId,
|
||||
basic_products.originUuid,
|
||||
basic_products.nameCode,
|
||||
basic_products.deviceRecordKey,
|
||||
basic_products.packRatio,
|
||||
basic_products.packUnit,
|
||||
basic_products.packLevel,
|
||||
basic_products.bhxjsl,
|
||||
basic_products.bhzxxsbzsl,
|
||||
basic_products.zxxsbzbhsydysl,
|
||||
basic_products.bhxjcpbm,
|
||||
basic_products.bzcj,
|
||||
basic_products.cpmctymc,
|
||||
basic_products.cplb,
|
||||
basic_products.flbm,
|
||||
basic_products.ggxh,
|
||||
basic_products.qxlb,
|
||||
basic_products.tyshxydm,
|
||||
basic_products.ylqxzcrbarmc,
|
||||
basic_products.zczbhhzbapzbh,
|
||||
basic_products.ylqxzcrbarywmc,
|
||||
basic_products.sydycpbs,
|
||||
basic_products.sjcpbm,
|
||||
basic_products.versionNumber,
|
||||
basic_products.diType,
|
||||
basic_products.ybbm,
|
||||
basic_products.sptm,
|
||||
basic_products.manufactory,
|
||||
basic_products.measname,
|
||||
basic_products.productType,
|
||||
basic_products.scbssfbhph,
|
||||
basic_products.scbssfbhxlh,
|
||||
basic_products.scbssfbhscrq,
|
||||
basic_products.scbssfbhsxrq,
|
||||
basic_products.cpms,
|
||||
basic_products.allowNoBatch,
|
||||
basic_products.allowNoExpire,
|
||||
basic_products.allowNoProduct,
|
||||
basic_products.allowNoSerial,
|
||||
basic_products.spmc,
|
||||
basic_products.cplx,
|
||||
basic_products.hchzsb,
|
||||
basic_products.cpdls,
|
||||
company_product_relevance.price,
|
||||
basic_products.basicPrductRemak1,
|
||||
basic_products.basicPrductRemak2,
|
||||
basic_products.basicPrductRemak3,
|
||||
basic_products.basicPrductRemak4,
|
||||
basic_products.basicPrductRemak5,
|
||||
basic_products.basicPrductRemak6,
|
||||
basic_products.basicPrductRemak7,
|
||||
basic_products.basicPrductRemak8,
|
||||
basic_products.sfwblztlcp,
|
||||
basic_products.cgzmraqxgxx,
|
||||
basic_products.sfbjwycxsy,
|
||||
basic_products.zdcfsycs,
|
||||
basic_products.sfwwjbz,
|
||||
basic_products.syqsfxyjxmj,
|
||||
basic_products.mjfs,
|
||||
basic_products.categoryName,
|
||||
company_product_relevance.unitFk,
|
||||
basic_corp.erpId as customerId,
|
||||
basic_corp.name companyName
|
||||
FROM basic_udirel
|
||||
inner JOIN basic_products
|
||||
ON basic_products.uuid = basic_udirel.uuid
|
||||
left join company_product_relevance
|
||||
on basic_udirel.id = company_product_relevance.udiRlIdFk
|
||||
left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
|
||||
left join basic_hosp_type bht on basic_udirel.relCode = bht.code
|
||||
left join thr_products tp on tp.code = basic_udirel.mainId
|
||||
left join basic_product_category_rel on basic_product_category_rel.relId = basic_udirel.id
|
||||
left join basic_product_category on basic_product_category_rel.code = basic_product_category.code
|
||||
<where>
|
||||
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
|
||||
AND basic_products.ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
|
||||
</if>
|
||||
<if test="category != '' and category != null">
|
||||
AND basic_product_category.name = #{category}
|
||||
</if>
|
||||
<if test="manufactory != '' and manufactory != null">
|
||||
AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
|
||||
</if>
|
||||
|
||||
<if test="supName != '' and supName != null">
|
||||
AND supName LIKE concat('%', #{supName}, '%')
|
||||
</if>
|
||||
<if test="ids != null and ids.size() > 0">
|
||||
and basic_udirel.id not in
|
||||
<foreach collection="ids" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="pinyinInitial != null and pinyinInitial != ''">
|
||||
AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%')
|
||||
</if>
|
||||
<if test="thrPiId != '' and thrPiId != null">
|
||||
and (basic_udirel.thirdId LIKE concat('%', #{thrPiId}, '%')
|
||||
or basic_udirel.thirdId1 LIKE concat('%', #{thrPiId}, '%')
|
||||
or basic_udirel.thirdId2 LIKE concat('%', #{thrPiId}, '%')
|
||||
or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%')
|
||||
or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%'))
|
||||
</if>
|
||||
<if test="ggxh != '' and ggxh != null">
|
||||
AND basic_products.ggxh LIKE concat('%', #{ggxh}, '%')
|
||||
</if>
|
||||
<if test="cpmctymc != '' and cpmctymc != null">
|
||||
AND basic_products.cpmctymc LIKE concat('%', #{cpmctymc}, '%')
|
||||
</if>
|
||||
<if test="nameCode != '' and nameCode != null">
|
||||
AND nameCode LIKE concat(#{nameCode}, '%')
|
||||
</if>
|
||||
<if test="thirdId != '' and thirdId != null">
|
||||
AND basic_udirel.thirdId LIKE concat(#{thirdId}, '%')
|
||||
</if>
|
||||
<if test="uuid != '' and uuid != null">
|
||||
AND basic_udirel.uuid = #{uuid}
|
||||
</if>
|
||||
<if test="unitFk != '' and unitFk != null">
|
||||
AND company_product_relevance.unitFk = #{unitFk}
|
||||
</if>
|
||||
<if test="id != '' and id != null">
|
||||
AND basic_udirel.id = #{id}
|
||||
</if>
|
||||
<if test="udplatCode != '' and udplatCode != null">
|
||||
AND basic_udirel.udplatCode = #{udplatCode}
|
||||
</if>
|
||||
<if test="diType != null">
|
||||
AND basic_products.diType = #{diType}
|
||||
</if>
|
||||
<if test="lockStatus != '' and lockStatus != null">
|
||||
AND basic_udirel.lockStatus = #{lockStatus}
|
||||
</if>
|
||||
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
|
||||
AND basic_products.zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
|
||||
</if>
|
||||
<if test="lastUpdateTime != null and lastUpdateTime != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
|
||||
]]>
|
||||
</if>
|
||||
<if test="mainId != '' and mainId != null">
|
||||
AND mainId = #{mainId}
|
||||
</if>
|
||||
<if test="unionFilterStr != '' and unionFilterStr != null">
|
||||
or basic_products.cpmctymc LIKE concat('%', #{unionFilterStr}, '%')
|
||||
or basic_products.ylqxzcrbarmc LIKE concat('%', #{unionFilterStr}, '%')
|
||||
or basic_products.ggxh LIKE concat('%', #{unionFilterStr}, '%')
|
||||
or basic_products.zczbhhzbapzbh LIKE concat('%', #{unionFilterStr}, '%')
|
||||
</if>
|
||||
<if test="isAdavence != '' and isAdavence != null">
|
||||
AND isAdavence = #{isAdavence}
|
||||
</if>
|
||||
<if test="uniqueNameCode != '' and uniqueNameCode != null">
|
||||
AND nameCode = #{uniqueNameCode}
|
||||
</if>
|
||||
<if test="relIds != null and relIds.size() > 0">
|
||||
and basic_udirel.id in
|
||||
<foreach collection="relIds" item="item" index="index" separator="," open="(" close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="flbm != '' and flbm != null">
|
||||
and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm} or tp.cplb = #{flbm} or
|
||||
basic_udirel.relCode = #{flbm})
|
||||
</if>
|
||||
<if test="companyName != '' and companyName != null">
|
||||
AND basic_corp.name like concat('%', #{companyName}, '%')
|
||||
</if>
|
||||
<if test="basicPrductRemak1 != '' and basicPrductRemak1 != null">
|
||||
AND basic_products.basicPrductRemak1 like concat('%', #{basicPrductRemak1}, '%')
|
||||
</if>
|
||||
<if test="basicPrductRemak2 != '' and basicPrductRemak2 != null">
|
||||
AND basic_products.basicPrductRemak2 like concat('%', #{basicPrductRemak2}, '%')
|
||||
</if>
|
||||
<if test="basicPrductRemak3 != '' and basicPrductRemak3 != null">
|
||||
AND basic_products.basicPrductRemak3 like concat('%', #{basicPrductRemak3}, '%')
|
||||
</if>
|
||||
<if test="basicPrductRemak4 != '' and basicPrductRemak4 != null">
|
||||
AND basic_products.basicPrductRemak4 like concat('%', #{basicPrductRemak4}, '%')
|
||||
</if>
|
||||
<if test="basicPrductRemak5 != '' and basicPrductRemak5 != null">
|
||||
AND basic_products.basicPrductRemak5 like concat('%', #{basicPrductRemak5}, '%')
|
||||
</if>
|
||||
<if test="basicPrductRemak6 != '' and basicPrductRemak6 != null">
|
||||
AND basic_products.basicPrductRemak6 like concat('%', #{basicPrductRemak6}, '%')
|
||||
</if>
|
||||
<if test="basicPrductRemak7 != '' and basicPrductRemak7 != null">
|
||||
AND basic_products.basicPrductRemak7 like concat('%', #{basicPrductRemak7}, '%')
|
||||
</if>
|
||||
<if test="basicPrductRemak8 != '' and basicPrductRemak8 != null">
|
||||
AND basic_products.basicPrductRemak8 like concat('%', #{basicPrductRemak8}, '%')
|
||||
</if>
|
||||
</where>
|
||||
GROUP BY basic_udirel.id
|
||||
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<select id="filterDestinyProducts" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
|
||||
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
|
||||
SELECT
|
||||
basic_udirel.*,
|
||||
basic_products.id AS PRId,
|
||||
basic_products.originUuid,
|
||||
basic_products.nameCode,
|
||||
basic_products.deviceRecordKey,
|
||||
basic_products.packRatio,
|
||||
basic_products.packUnit,
|
||||
basic_products.packLevel,
|
||||
basic_products.bhxjsl,
|
||||
basic_products.bhzxxsbzsl,
|
||||
basic_products.zxxsbzbhsydysl,
|
||||
basic_products.bhxjcpbm,
|
||||
basic_products.bzcj,
|
||||
basic_products.cpmctymc,
|
||||
basic_products.cplb,
|
||||
basic_products.flbm,
|
||||
basic_products.ggxh,
|
||||
basic_products.qxlb,
|
||||
basic_products.tyshxydm,
|
||||
basic_products.ylqxzcrbarmc,
|
||||
basic_products.zczbhhzbapzbh,
|
||||
basic_products.ylqxzcrbarywmc,
|
||||
basic_products.sydycpbs,
|
||||
basic_products.sjcpbm,
|
||||
basic_products.versionNumber,
|
||||
basic_products.diType,
|
||||
basic_products.ybbm,
|
||||
basic_products.sptm,
|
||||
basic_products.manufactory,
|
||||
basic_products.measname,
|
||||
basic_products.productType,
|
||||
basic_products.scbssfbhph,
|
||||
basic_products.scbssfbhxlh,
|
||||
basic_products.scbssfbhscrq,
|
||||
basic_products.scbssfbhsxrq,
|
||||
basic_products.cpms,
|
||||
basic_products.allowNoBatch,
|
||||
basic_products.allowNoExpire,
|
||||
basic_products.allowNoProduct,
|
||||
basic_products.allowNoSerial,
|
||||
basic_products.spmc,
|
||||
basic_products.cplx,
|
||||
basic_products.hchzsb,
|
||||
basic_products.cpdls,
|
||||
basic_products.basicPrductRemak1,
|
||||
basic_products.basicPrductRemak2,
|
||||
basic_products.basicPrductRemak3,
|
||||
basic_products.basicPrductRemak4,
|
||||
basic_products.basicPrductRemak5,
|
||||
basic_products.basicPrductRemak6,
|
||||
basic_products.basicPrductRemak7,
|
||||
basic_products.basicPrductRemak8,
|
||||
basic_destiny_rel.count as count,
|
||||
basic_destiny_rel.id as deId
|
||||
FROM
|
||||
basic_udirel
|
||||
INNER JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
|
||||
INNER JOIN basic_destiny_rel ON basic_destiny_rel.relId = basic_udirel.id
|
||||
<where>
|
||||
<if test="ids != null and ids.size() > 0">
|
||||
and basic_udirel.id in
|
||||
<foreach collection="ids" item="item" open="(" separator="," close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="diType != null">
|
||||
AND basic_products.diType = #{diType}
|
||||
</if>
|
||||
<if test="cpmctymc != '' and cpmctymc != null">
|
||||
AND basic_products.cpmctymc like concat('%', #{cpmctymc}, '%')
|
||||
</if>
|
||||
<if test="destinyId != '' and destinyId != null">
|
||||
AND basic_destiny_rel.pId = #{destinyId}
|
||||
</if>
|
||||
</where>
|
||||
group by basic_products.uuid
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,50 @@
|
||||
<?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.IoDestinyProcessCodeMapper">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inout.IoDestinyProcessCodeEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table udi_wms.io_destiny_process_code-->
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" />
|
||||
<result column="bindRlFk" jdbcType="VARCHAR" property="bindRlFk" />
|
||||
<result column="uuidFk" jdbcType="VARCHAR" property="uuidFk" />
|
||||
<result column="nameCode" jdbcType="VARCHAR" property="nameCode" />
|
||||
<result column="batchNo" jdbcType="VARCHAR" property="batchNo" />
|
||||
<result column="productDate" jdbcType="VARCHAR" property="productDate" />
|
||||
<result column="expireDate" jdbcType="VARCHAR" property="expireDate" />
|
||||
<result column="price" jdbcType="DECIMAL" property="price" />
|
||||
<result column="supId" jdbcType="VARCHAR" property="supId" />
|
||||
<result column="count" jdbcType="INTEGER" property="count" />
|
||||
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, orderIdFk, bindRlFk, uuidFk, nameCode, batchNo, productDate, expireDate, price,
|
||||
supId, `count`, updateTime
|
||||
</sql>
|
||||
|
||||
<select id="filterDestinyProcessCode" parameterType="com.glxp.api.req.inout.IodestinyProcessRequest"
|
||||
resultType="com.glxp.api.res.inout.IodestinyProcessResponse">
|
||||
SELECT
|
||||
ps.*,
|
||||
b2.ggxh,
|
||||
b2.cpmctymc,
|
||||
b2.measname,
|
||||
b2.ylqxzcrbarmc,
|
||||
b2.zczbhhzbapzbh,
|
||||
b2.manufactory
|
||||
FROM
|
||||
io_destiny_process_code ps
|
||||
LEFT JOIN basic_udirel b1 ON b1.id = ps.bindRlFk
|
||||
left JOIN basic_products b2 on b2.uuid=b1.uuid
|
||||
<where>
|
||||
<if test="billNo != '' and billNo != null">
|
||||
AND ps.orderIdFk = #{billNo}
|
||||
</if>
|
||||
</where>
|
||||
group by ps.id
|
||||
order by ps.updateTime desc
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,92 @@
|
||||
<?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.IoDestinyProcessDetailMapper">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inout.IoDestinyProcessDetailEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table udi_wms.io_destiny_process_detail-->
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="relId" jdbcType="BIGINT" property="relId" />
|
||||
<result column="count" jdbcType="INTEGER" property="count" />
|
||||
<result column="reCount" jdbcType="INTEGER" property="reCount" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, relId, `count`, reCount
|
||||
</sql>
|
||||
|
||||
<select id="filterDestinyProducts" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
|
||||
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
|
||||
SELECT
|
||||
basic_udirel.*,
|
||||
basic_products.id AS PRId,
|
||||
basic_products.originUuid,
|
||||
basic_products.nameCode,
|
||||
basic_products.deviceRecordKey,
|
||||
basic_products.bhzxxsbzsl,
|
||||
basic_products.zxxsbzbhsydysl,
|
||||
basic_products.bhxjcpbm,
|
||||
basic_products.bzcj,
|
||||
basic_products.cpmctymc,
|
||||
basic_products.cplb,
|
||||
basic_products.flbm,
|
||||
basic_products.ggxh,
|
||||
basic_products.qxlb,
|
||||
basic_products.tyshxydm,
|
||||
basic_products.ylqxzcrbarmc,
|
||||
basic_products.zczbhhzbapzbh,
|
||||
basic_products.ylqxzcrbarywmc,
|
||||
basic_products.sydycpbs,
|
||||
basic_products.sjcpbm,
|
||||
basic_products.versionNumber,
|
||||
basic_products.diType,
|
||||
basic_products.ybbm,
|
||||
basic_products.sptm,
|
||||
basic_products.manufactory,
|
||||
basic_products.measname,
|
||||
basic_products.productType,
|
||||
basic_products.spmc,
|
||||
basic_products.cplx,
|
||||
basic_products.hchzsb,
|
||||
basic_products.cpdls,
|
||||
io_destiny_process_detail.count as count,
|
||||
io_destiny_process_detail.reCount as reCount,
|
||||
io_destiny_process_detail.id as deId
|
||||
FROM
|
||||
basic_udirel
|
||||
INNER JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
|
||||
INNER JOIN io_destiny_process_detail ON io_destiny_process_detail.relId = basic_udirel.id
|
||||
<where>
|
||||
<if test="diType != null">
|
||||
AND basic_products.diType = #{diType}
|
||||
</if>
|
||||
<if test="cpmctymc != '' and cpmctymc != null">
|
||||
AND basic_products.cpmctymc like concat('%', #{cpmctymc}, '%')
|
||||
</if>
|
||||
<if test="billNo != '' and billNo != null">
|
||||
AND io_destiny_process_detail.orderIdFk = #{billNo}
|
||||
</if>
|
||||
</where>
|
||||
group by io_destiny_process_detail.id
|
||||
order by io_destiny_process_detail.updateTime asc
|
||||
</select>
|
||||
|
||||
|
||||
<select id="filterDestinyProcess" parameterType="com.glxp.api.req.inout.IodestinyProcessRequest"
|
||||
resultType="com.glxp.api.res.inout.IodestinyProcessResponse">
|
||||
SELECT
|
||||
i1.*,
|
||||
a1.`name` AS invName,
|
||||
au.userName AS updateName,
|
||||
au2.userName AS createName
|
||||
FROM
|
||||
io_destiny_process i1
|
||||
LEFT JOIN auth_warehouse a1 ON a1.`code` = i1.invCode
|
||||
LEFT JOIN auth_user au ON au.id = i1.updateUser
|
||||
LEFT JOIN auth_user au2 ON au2.id = i1.createUser
|
||||
<where>
|
||||
|
||||
</where>
|
||||
order by i1.updateTime desc
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@ -0,0 +1,25 @@
|
||||
<?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.IoDestinyProcessMapper">
|
||||
<resultMap id="BaseResultMap" type="com.glxp.api.entity.inout.IoDestinyProcessEntity">
|
||||
<!--@mbg.generated-->
|
||||
<!--@Table udi_wms.io_destiny_process-->
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="destinyId" jdbcType="BIGINT" property="destinyId" />
|
||||
<result column="destinyNo" jdbcType="BIGINT" property="destinyNo" />
|
||||
<result column="billNo" jdbcType="VARCHAR" property="billNo" />
|
||||
<result column="billDate" jdbcType="TIMESTAMP" property="billDate" />
|
||||
<result column="invCode" jdbcType="VARCHAR" property="invCode" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" />
|
||||
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" />
|
||||
<result column="createUser" jdbcType="VARCHAR" property="createUser" />
|
||||
<result column="updateUser" jdbcType="VARCHAR" property="updateUser" />
|
||||
<result column="status" jdbcType="INTEGER" property="status" />
|
||||
</resultMap>
|
||||
<sql id="Base_Column_List">
|
||||
<!--@mbg.generated-->
|
||||
id, destinyId, destinyNo, billNo, billDate, invCode, remark, createTime, updateTime,
|
||||
`createUser`, updateUser, `status`
|
||||
</sql>
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue