供应商耗材字典管理，单据管理
anthonywj
2 years ago
parent
b5f30ce1c4
commit
58bf32ddf5
@ -0,0 +1,203 @@
|
||||
package com.glxp.api.controller.basic;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.annotation.AuthRuleAnnotation;
|
||||
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.auth.AuthAdmin;
|
||||
import com.glxp.api.entity.basic.BasicCorpEntity;
|
||||
import com.glxp.api.entity.basic.UdiRlSupEntity;
|
||||
import com.glxp.api.exception.JsonException;
|
||||
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
|
||||
import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest;
|
||||
import com.glxp.api.req.basic.FilterUdiRelRequest;
|
||||
import com.glxp.api.req.basic.UdiInfoExportRequest;
|
||||
import com.glxp.api.req.system.CompanyRequest;
|
||||
import com.glxp.api.req.system.DeleteCompanyFileRequest;
|
||||
import com.glxp.api.res.PageSimpleResponse;
|
||||
import com.glxp.api.res.basic.UdiRlSupResponse;
|
||||
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
||||
import com.glxp.api.service.auth.AuthAdminService;
|
||||
import com.glxp.api.service.basic.BasicUnitMaintainService;
|
||||
import com.glxp.api.service.basic.UdiRlSupService;
|
||||
import com.glxp.api.service.basic.CompanyProductsRelService;
|
||||
import com.glxp.api.service.basic.UdiRelevanceService;
|
||||
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 org.springframework.web.context.request.RequestContextHolder;
|
||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 供应商关联耗材字典信息
|
||||
*/
|
||||
@RestController
|
||||
public class UdiRlSupController {
|
||||
@Resource
|
||||
private AuthAdminService authAdminService;
|
||||
@Resource
|
||||
private UdiRlSupService udiRlSupService;
|
||||
@Resource
|
||||
private CompanyProductsRelService companyProductsRelService;
|
||||
@Resource
|
||||
private BasicUnitMaintainService basicUnitMaintainService;
|
||||
|
||||
@Resource
|
||||
private UdiRelevanceService udiRelevanceService;
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/sale/info/company/product/relevance/filter")
|
||||
public BaseResponse filterCompanyProductRelevance(CompanyProductRelevanceRequest companyProductRelevanceRequest,
|
||||
BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
|
||||
if (StrUtil.isNotEmpty(companyProductRelevanceRequest.getUnionCode())) {
|
||||
FilterUdiRelRequest filterUdiInfoRequest = new FilterUdiRelRequest();
|
||||
filterUdiInfoRequest.setNameCode(companyProductRelevanceRequest.getUnionCode());
|
||||
List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
|
||||
if (temps != null && temps.size() > 0) {
|
||||
companyProductRelevanceRequest.setUuid(temps.get(0).getUuid());
|
||||
companyProductRelevanceRequest.setNameCode(filterUdiInfoRequest.getNameCode());
|
||||
companyProductRelevanceRequest.setUnionCode(null);
|
||||
}
|
||||
} else {
|
||||
companyProductRelevanceRequest.setDiType(1);
|
||||
}
|
||||
List<UdiRlSupResponse> basicInstrumentMaintainRelevanceResponses = null;
|
||||
basicInstrumentMaintainRelevanceResponses = udiRlSupService.filterUdiGp(companyProductRelevanceRequest);
|
||||
PageInfo<UdiRlSupResponse> pageInfo;
|
||||
pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);
|
||||
PageSimpleResponse<UdiRlSupResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses);
|
||||
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/sale/info/company/product/corp/filter")
|
||||
public BaseResponse filterRlCorp(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest,
|
||||
BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
if (StrUtil.isEmpty(filterCompanyProductRelevanceRequest.getUdiRlIdFk())) {
|
||||
return ResultVOUtils.error(500, "请先选择产品！");
|
||||
}
|
||||
List<UdiRlSupEntity> companyProductRelevanceEntities =
|
||||
udiRlSupService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
|
||||
|
||||
if (!companyProductRelevanceEntities.isEmpty()) {
|
||||
List<String> erpIds = new ArrayList<>();
|
||||
for (UdiRlSupEntity udiRlSupEntity : companyProductRelevanceEntities) {
|
||||
erpIds.add(udiRlSupEntity.getUnitFk());
|
||||
}
|
||||
List<BasicCorpEntity> basicUnitMaintainEntities = basicUnitMaintainService.batchSelectByErpIdsAndName(erpIds, filterCompanyProductRelevanceRequest.getKey());
|
||||
return ResultVOUtils.success(basicUnitMaintainEntities);
|
||||
}
|
||||
return ResultVOUtils.error(500, "该产品未关联供应商！");
|
||||
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/spms/info/company/product/filterAll")
|
||||
public BaseResponse filterAll(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest,
|
||||
BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<UdiRlSupEntity> companyProductRelevanceEntities =
|
||||
udiRlSupService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
|
||||
PageInfo<UdiRlSupEntity> pageInfo;
|
||||
pageInfo = new PageInfo<>(companyProductRelevanceEntities);
|
||||
PageSimpleResponse<UdiRlSupEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(companyProductRelevanceEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/sale/info/companyProductRelevance")
|
||||
public BaseResponse getCompanyProductRelevanceInfo(CompanyRequest companyRequest) {
|
||||
UdiRlSupEntity udiRlSupEntity = udiRlSupService.findCompanyProductRelevance(companyRequest.getCustomerId());
|
||||
if (udiRlSupEntity != null) {
|
||||
return ResultVOUtils.success(udiRlSupEntity);
|
||||
}
|
||||
return ResultVOUtils.error(500, "空");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@GetMapping("/sale/info/getCompanyProductRelevance")
|
||||
public BaseResponse getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest) {
|
||||
// filterCompanyProductRelevanceRequest.setCustomerId(getCustomerId());
|
||||
List<UdiRlSupEntity> companyProductRelevanceEntities = udiRlSupService.getCompanyProductRelevance(filterCompanyProductRelevanceRequest);
|
||||
PageInfo<UdiRlSupEntity> pageInfo = new PageInfo<>(companyProductRelevanceEntities);
|
||||
PageSimpleResponse<UdiRlSupEntity> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(companyProductRelevanceEntities);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/sale/info/insertCompanyProductRelevance")
|
||||
public BaseResponse insertCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) {
|
||||
if (udiRlSupService.findCompanyProductRelevanceByProductUuid(udiRlSupEntity) != null) {
|
||||
return ResultVOUtils.error(ResultEnum.DATA_REPEAT);
|
||||
}
|
||||
udiRlSupEntity.setUnitFk(null);
|
||||
udiRlSupEntity.setCreateTime(new Date());
|
||||
udiRlSupEntity.setUpdateTime(new Date());
|
||||
udiRlSupEntity.setAuditStatus("3");
|
||||
boolean b = udiRlSupService.insertCompanyProductRelevance(udiRlSupEntity);
|
||||
return ResultVOUtils.success("成功");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/sale/info/insertFilter")
|
||||
public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) {
|
||||
if (StrUtil.isEmpty(udiInfoExportRequest.getUnitFk())) {
|
||||
return ResultVOUtils.error(500, "未选择供应商！");
|
||||
}
|
||||
companyProductsRelService.insertCompanyProducts(udiInfoExportRequest);
|
||||
return ResultVOUtils.success("后台正在导入，请稍后刷新查看！");
|
||||
}
|
||||
|
||||
@AuthRuleAnnotation("")
|
||||
@PostMapping("/sale/info/updateCompanyProductRelevance")
|
||||
public BaseResponse updateCompanyProductRelevance(@RequestBody UdiRlSupEntity udiRlSupEntity) {
|
||||
udiRlSupEntity.setUpdateTime(new Date());
|
||||
int b = udiRlSupService.updateCompanyProductRelevance(udiRlSupEntity);
|
||||
return ResultVOUtils.success("修改成功");
|
||||
}
|
||||
|
||||
@PostMapping("/sale/info/deleteCompanyProductRelevance")
|
||||
public BaseResponse deleteCompanyProductRelevance(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) {
|
||||
boolean b = udiRlSupService.deleteById(deleteCompanyFileRequest.getId());
|
||||
return ResultVOUtils.success("成功");
|
||||
}
|
||||
|
||||
public String getCustomerId() {
|
||||
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
|
||||
if (attributes == null) {
|
||||
throw new JsonException(ResultEnum.NOT_NETWORK);
|
||||
}
|
||||
HttpServletRequest request = attributes.getRequest();
|
||||
String userId = request.getHeader("ADMIN_ID");
|
||||
AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId));
|
||||
return authAdmin.getCustomerId() + "";
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.glxp.api.controller.inout;
|
||||
|
||||
import com.glxp.api.service.inout.IoOrderService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
public class IoOrderController {
|
||||
@Resource
|
||||
IoOrderService orderService;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
package com.glxp.api.dao.basic;
|
||||
|
||||
import com.glxp.api.dao.BaseMapperPlus;
|
||||
import com.glxp.api.entity.basic.UdiRlSupEntity;
|
||||
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
|
||||
import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest;
|
||||
import com.glxp.api.res.basic.UdiRlSupResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface UdiRlSupDao extends BaseMapperPlus<UdiRlSupDao, UdiRlSupEntity, UdiRlSupEntity> {
|
||||
|
||||
List<UdiRlSupResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest);
|
||||
|
||||
List<UdiRlSupEntity> filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
|
||||
|
||||
UdiRlSupEntity findCompanyProductRelevance(String CustomerId);
|
||||
|
||||
UdiRlSupEntity findCompanyProductRelevanceByProductId(String productId);
|
||||
|
||||
UdiRlSupEntity findCompanyProductRelevanceByUdiRlIdFk(@Param("udiRlIdFk") String udiRlIdFk, @Param("customerId") String customerId);
|
||||
|
||||
UdiRlSupEntity findCompanyProductRelevanceByProductUuid(UdiRlSupEntity udiRlSupEntity);
|
||||
|
||||
List<UdiRlSupEntity> getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
|
||||
|
||||
|
||||
boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity);
|
||||
|
||||
boolean importCompanyProductRelevance(UdiRlSupEntity udiRlSupEntity);
|
||||
|
||||
boolean deleteById(String id);
|
||||
|
||||
boolean deleteByRlId(String id);
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package com.glxp.api.dao.inout;
|
||||
|
||||
import com.glxp.api.dao.BaseMapperPlus;
|
||||
import com.glxp.api.entity.inout.IoCodeEnttity;
|
||||
import com.glxp.api.entity.inout.IoOrderEntity;
|
||||
|
||||
public interface IoCodeDao extends BaseMapperPlus<IoCodeDao, IoCodeEnttity, IoCodeEnttity> {
|
||||
}
|
||||
@ -0,0 +1,7 @@
|
||||
package com.glxp.api.dao.inout;
|
||||
|
||||
import com.glxp.api.dao.BaseMapperPlus;
|
||||
import com.glxp.api.entity.inout.IoOrderEntity;
|
||||
|
||||
public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, IoOrderEntity> {
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package com.glxp.api.entity.basic;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class UdiRlSupEntity {
|
||||
|
||||
private Integer id;
|
||||
private String customerId;
|
||||
private String productId;
|
||||
private String enterpriseId;
|
||||
private String registrationId;
|
||||
private String auditStatus;
|
||||
private String productUuid;
|
||||
private String udiRlIdFk;
|
||||
private String unitFk;
|
||||
private BigDecimal price;
|
||||
|
||||
private Date createTime;
|
||||
private Date updateTime;
|
||||
private String createUser;
|
||||
private String updateUser;
|
||||
}
|
||||
@ -0,0 +1,186 @@
|
||||
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.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "io_order_detail_biz")
|
||||
public class IoOrderDetailBizEntity implements Serializable {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Integer 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 = "coName")
|
||||
private String coName;
|
||||
|
||||
/**
|
||||
* 注册证号
|
||||
*/
|
||||
@TableField(value = "certCode")
|
||||
private String certCode;
|
||||
|
||||
/**
|
||||
* 医疗器械注册备案证号
|
||||
*/
|
||||
@TableField(value = "ylqxzcrbarmc")
|
||||
private String ylqxzcrbarmc;
|
||||
|
||||
/**
|
||||
* 生产企业
|
||||
*/
|
||||
@TableField(value = "manufacturer")
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 计量单位
|
||||
*/
|
||||
@TableField(value = "measname")
|
||||
private String measname;
|
||||
|
||||
/**
|
||||
* 规格型号
|
||||
*/
|
||||
@TableField(value = "spec")
|
||||
private String spec;
|
||||
|
||||
/**
|
||||
* 价格
|
||||
*/
|
||||
@TableField(value = "price")
|
||||
private BigDecimal price;
|
||||
|
||||
/**
|
||||
* 销售清单号
|
||||
*/
|
||||
@TableField(value = "secSalesListNo")
|
||||
private String secSalesListNo;
|
||||
|
||||
/**
|
||||
* 发票第一票
|
||||
*/
|
||||
@TableField(value = "firstSalesInvNo")
|
||||
private String firstSalesInvNo;
|
||||
|
||||
/**
|
||||
* 发票第二票
|
||||
*/
|
||||
@TableField(value = "secSalesInvNo")
|
||||
private String secSalesInvNo;
|
||||
|
||||
/**
|
||||
* 发票有效期
|
||||
*/
|
||||
@TableField(value = "invoiceDate")
|
||||
private String invoiceDate;
|
||||
|
||||
/**
|
||||
* 供应商ID外键
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private String supId;
|
||||
|
||||
/**
|
||||
* 绑定供应商状态
|
||||
*/
|
||||
@TableField(value = "bindSupStatus")
|
||||
private String bindSupStatus;
|
||||
|
||||
/**
|
||||
* 单据数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 扫码数量
|
||||
*/
|
||||
@TableField(value = "reCount")
|
||||
private Integer reCount;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 扩展字段1
|
||||
*/
|
||||
@TableField(value = "remark1")
|
||||
private String remark1;
|
||||
|
||||
/**
|
||||
* 扩展字段2
|
||||
*/
|
||||
@TableField(value = "remark2")
|
||||
private String remark2;
|
||||
|
||||
/**
|
||||
* 扩展字段3
|
||||
*/
|
||||
@TableField(value = "remark3")
|
||||
private String remark3;
|
||||
|
||||
/**
|
||||
* 扩展字段4
|
||||
*/
|
||||
@TableField(value = "remark4")
|
||||
private String remark4;
|
||||
|
||||
/**
|
||||
* 扩展字段5
|
||||
*/
|
||||
@TableField(value = "remark5")
|
||||
private String remark5;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
@ -0,0 +1,186 @@
|
||||
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.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "io_order_detail_code")
|
||||
public class IoOrderDetailCodeEntity implements Serializable {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Integer 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 = "coName")
|
||||
private String coName;
|
||||
|
||||
/**
|
||||
* 注册证号
|
||||
*/
|
||||
@TableField(value = "certCode")
|
||||
private String certCode;
|
||||
|
||||
/**
|
||||
* 医疗器械注册备案证号
|
||||
*/
|
||||
@TableField(value = "ylqxzcrbarmc")
|
||||
private String ylqxzcrbarmc;
|
||||
|
||||
/**
|
||||
* 生产企业
|
||||
*/
|
||||
@TableField(value = "manufacturer")
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 计量单位
|
||||
*/
|
||||
@TableField(value = "measname")
|
||||
private String measname;
|
||||
|
||||
/**
|
||||
* 规格型号
|
||||
*/
|
||||
@TableField(value = "spec")
|
||||
private String spec;
|
||||
|
||||
/**
|
||||
* 价格
|
||||
*/
|
||||
@TableField(value = "price")
|
||||
private BigDecimal price;
|
||||
|
||||
/**
|
||||
* 销售清单号
|
||||
*/
|
||||
@TableField(value = "secSalesListNo")
|
||||
private String secSalesListNo;
|
||||
|
||||
/**
|
||||
* 发票第一票
|
||||
*/
|
||||
@TableField(value = "firstSalesInvNo")
|
||||
private String firstSalesInvNo;
|
||||
|
||||
/**
|
||||
* 发票第二票
|
||||
*/
|
||||
@TableField(value = "secSalesInvNo")
|
||||
private String secSalesInvNo;
|
||||
|
||||
/**
|
||||
* 发票有效期
|
||||
*/
|
||||
@TableField(value = "invoiceDate")
|
||||
private String invoiceDate;
|
||||
|
||||
/**
|
||||
* 供应商ID外键
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private String supId;
|
||||
|
||||
/**
|
||||
* 绑定供应商状态
|
||||
*/
|
||||
@TableField(value = "bindSupStatus")
|
||||
private String bindSupStatus;
|
||||
|
||||
/**
|
||||
* 单据数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 扫码数量
|
||||
*/
|
||||
@TableField(value = "reCount")
|
||||
private Integer reCount;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 扩展字段1
|
||||
*/
|
||||
@TableField(value = "remark1")
|
||||
private String remark1;
|
||||
|
||||
/**
|
||||
* 扩展字段2
|
||||
*/
|
||||
@TableField(value = "remark2")
|
||||
private String remark2;
|
||||
|
||||
/**
|
||||
* 扩展字段3
|
||||
*/
|
||||
@TableField(value = "remark3")
|
||||
private String remark3;
|
||||
|
||||
/**
|
||||
* 扩展字段4
|
||||
*/
|
||||
@TableField(value = "remark4")
|
||||
private String remark4;
|
||||
|
||||
/**
|
||||
* 扩展字段5
|
||||
*/
|
||||
@TableField(value = "remark5")
|
||||
private String remark5;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
@ -0,0 +1,186 @@
|
||||
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.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@TableName(value = "io_order_detail_result")
|
||||
public class IoOrderDetailResultEntity implements Serializable {
|
||||
@TableId(value = "id", type = IdType.INPUT)
|
||||
private Integer 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 = "coName")
|
||||
private String coName;
|
||||
|
||||
/**
|
||||
* 注册证号
|
||||
*/
|
||||
@TableField(value = "certCode")
|
||||
private String certCode;
|
||||
|
||||
/**
|
||||
* 医疗器械注册备案证号
|
||||
*/
|
||||
@TableField(value = "ylqxzcrbarmc")
|
||||
private String ylqxzcrbarmc;
|
||||
|
||||
/**
|
||||
* 生产企业
|
||||
*/
|
||||
@TableField(value = "manufacturer")
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 计量单位
|
||||
*/
|
||||
@TableField(value = "measname")
|
||||
private String measname;
|
||||
|
||||
/**
|
||||
* 规格型号
|
||||
*/
|
||||
@TableField(value = "spec")
|
||||
private String spec;
|
||||
|
||||
/**
|
||||
* 价格
|
||||
*/
|
||||
@TableField(value = "price")
|
||||
private BigDecimal price;
|
||||
|
||||
/**
|
||||
* 销售清单号
|
||||
*/
|
||||
@TableField(value = "secSalesListNo")
|
||||
private String secSalesListNo;
|
||||
|
||||
/**
|
||||
* 发票第一票
|
||||
*/
|
||||
@TableField(value = "firstSalesInvNo")
|
||||
private String firstSalesInvNo;
|
||||
|
||||
/**
|
||||
* 发票第二票
|
||||
*/
|
||||
@TableField(value = "secSalesInvNo")
|
||||
private String secSalesInvNo;
|
||||
|
||||
/**
|
||||
* 发票有效期
|
||||
*/
|
||||
@TableField(value = "invoiceDate")
|
||||
private String invoiceDate;
|
||||
|
||||
/**
|
||||
* 供应商ID外键
|
||||
*/
|
||||
@TableField(value = "supId")
|
||||
private String supId;
|
||||
|
||||
/**
|
||||
* 绑定供应商状态
|
||||
*/
|
||||
@TableField(value = "bindSupStatus")
|
||||
private String bindSupStatus;
|
||||
|
||||
/**
|
||||
* 单据数量
|
||||
*/
|
||||
@TableField(value = "`count`")
|
||||
private Integer count;
|
||||
|
||||
/**
|
||||
* 扫码数量
|
||||
*/
|
||||
@TableField(value = "reCount")
|
||||
private Integer reCount;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@TableField(value = "remark")
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 扩展字段1
|
||||
*/
|
||||
@TableField(value = "remark1")
|
||||
private String remark1;
|
||||
|
||||
/**
|
||||
* 扩展字段2
|
||||
*/
|
||||
@TableField(value = "remark2")
|
||||
private String remark2;
|
||||
|
||||
/**
|
||||
* 扩展字段3
|
||||
*/
|
||||
@TableField(value = "remark3")
|
||||
private String remark3;
|
||||
|
||||
/**
|
||||
* 扩展字段4
|
||||
*/
|
||||
@TableField(value = "remark4")
|
||||
private String remark4;
|
||||
|
||||
/**
|
||||
* 扩展字段5
|
||||
*/
|
||||
@TableField(value = "remark5")
|
||||
private String remark5;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
}
|
||||
@ -0,0 +1,103 @@
|
||||
package com.glxp.api.http;
|
||||
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.alibaba.fastjson.TypeReference;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.entity.system.SyncDataSetEntity;
|
||||
import com.glxp.api.req.inout.PostOrderRequest;
|
||||
import com.glxp.api.service.system.SyncDataSetService;
|
||||
import com.glxp.api.util.OkHttpCli;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
@Service
|
||||
public class SpsDirectClient {
|
||||
@Resource
|
||||
private OkHttpCli okHttpCli;
|
||||
@Resource
|
||||
SyncDataSetService syncDataSetService;
|
||||
|
||||
public String getIpUrl() {
|
||||
SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
|
||||
return syncDataSetEntity.getSyncIp();
|
||||
}
|
||||
|
||||
//单据验收 todo
|
||||
// public BaseResponse reviewOrder(OrderFilterRequest orderFilterRequest) {
|
||||
// String json = JSONUtil.toJsonStr(orderFilterRequest);
|
||||
// String result = okHttpCli.doPostJson(getIpUrl() + "/sps/review/download/order/finsih", json);
|
||||
// BaseResponse<String> response =
|
||||
// JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
|
||||
// });
|
||||
// return response;
|
||||
//
|
||||
// }
|
||||
|
||||
//获取未验收的单据
|
||||
public BaseResponse downloadOrder(String orderId, String wmsUserId, String action) {
|
||||
Map<String, String> paramMap = new HashMap<>(16);
|
||||
paramMap.put("wmsUserId", wmsUserId);
|
||||
paramMap.put("orderId", orderId);
|
||||
paramMap.put("action", action);
|
||||
String response = okHttpCli.doGet(getIpUrl() + "/sps/review/download/order", paramMap);
|
||||
try {
|
||||
BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
|
||||
});
|
||||
return data;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return ResultVOUtils.error(500, "连接失败！");
|
||||
}
|
||||
}
|
||||
|
||||
//获取未验收的单据详情
|
||||
public BaseResponse downloadOrderDetail(String orderId, String wmsUserId) {
|
||||
Map<String, String> paramMap = new HashMap<>(16);
|
||||
paramMap.put("wmsUserId", wmsUserId);
|
||||
paramMap.put("orderId", orderId);
|
||||
String response = okHttpCli.doGet(getIpUrl() + "/sps/review/download/orderDetail", paramMap);
|
||||
try {
|
||||
BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
|
||||
});
|
||||
return data;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return ResultVOUtils.error(500, "连接失败！");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//获取未验收的单据条码
|
||||
public BaseResponse downloadCodes(String wmsUserId, String orderId) {
|
||||
Map<String, String> paramMap = new HashMap<>(16);
|
||||
paramMap.put("wmsUserId", wmsUserId);
|
||||
paramMap.put("orderId", orderId);
|
||||
String response = okHttpCli.doGet(getIpUrl() + "/sps/review/download/codes", paramMap);
|
||||
try {
|
||||
BaseResponse data = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
|
||||
});
|
||||
return data;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return ResultVOUtils.error(500, "连接失败！");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//单据上传
|
||||
public BaseResponse uploadPdaOrder(PostOrderRequest postOrderRequest) {
|
||||
String json = JSONUtil.toJsonStr(postOrderRequest);
|
||||
String result = okHttpCli.doPostJson(getIpUrl() + "/sps/pda/upload/orders", json);
|
||||
BaseResponse<String> response =
|
||||
JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
|
||||
});
|
||||
return response;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package com.glxp.api.req.basic;
|
||||
|
||||
import com.glxp.api.req.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterCompanyProductRelevanceRequest extends ListPageRequest {
|
||||
|
||||
private Long customerId;
|
||||
private Long productId;
|
||||
private String productUuid;
|
||||
private String udiRlIdFk;
|
||||
private String unitFk;
|
||||
private String lastUpdateTime;
|
||||
private String key;
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package com.glxp.api.req.basic;
|
||||
|
||||
import com.glxp.api.req.ListPageRequest;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class UdiInfoExportRequest extends ListPageRequest {
|
||||
|
||||
List<String> rlIds;
|
||||
List<String> uuids;
|
||||
private Long customerId;
|
||||
private String ylqxzcrbarmc;
|
||||
private String cpmctymc;
|
||||
private String nameCode;
|
||||
private String uuid;
|
||||
private String ggxh;
|
||||
private String thirdId;
|
||||
private String id;
|
||||
private String unitFk;
|
||||
private String thirdId1;
|
||||
private String thirdId2;
|
||||
private String thirdId3;
|
||||
private String thirdId4;
|
||||
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.glxp.api.req.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class AddEnterCodeRequest {
|
||||
private String originCode;
|
||||
private String code;
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package com.glxp.api.req.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class AddOrderRequest {
|
||||
private String corpOrderId;
|
||||
private String code;
|
||||
private String mainAction;
|
||||
private String action;
|
||||
private String fromCorp;
|
||||
private String fromInvCode;
|
||||
private String billType;
|
||||
private String deptCode;
|
||||
private String invCode;
|
||||
private String orderId;
|
||||
private Long customerId;
|
||||
private boolean outChangeEnable;
|
||||
private boolean ignoreExpire;
|
||||
private boolean ignoreRecentExpire;
|
||||
private boolean ignoreCode;
|
||||
private boolean preCheck;
|
||||
private String batchNo;
|
||||
private String produceDate;
|
||||
private String expireDate;
|
||||
private String serialNo;
|
||||
private boolean vailInv;
|
||||
private boolean codeFillCheck;
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package com.glxp.api.req.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FilterIoCodeRequest {
|
||||
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
package com.glxp.api.req.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PdaCodeEntity {
|
||||
private Long id;
|
||||
private String action;
|
||||
private String mainAction;
|
||||
private String code;
|
||||
private String corpOrderId;
|
||||
private String actor;
|
||||
private String actDate;
|
||||
private String fromCorpId;
|
||||
private String fromCorp;
|
||||
private String orderId;
|
||||
private String batchNo;
|
||||
private String produceDate;
|
||||
private String expireDate;
|
||||
private String serialNo;
|
||||
private Integer count; //扫码数量
|
||||
private Integer reCount; //实际数量
|
||||
private String packageLevel;
|
||||
private String warehouseCode;
|
||||
|
||||
private String customerId;
|
||||
private String nameCode;
|
||||
private Integer sCount;
|
||||
private String supId;//供应商ID
|
||||
private String supName;
|
||||
private String invStorageCode;
|
||||
private String invWarehouseCode;
|
||||
private String relId;
|
||||
private Integer status;
|
||||
private String locStorageCode;
|
||||
private String fromSubInvCode;
|
||||
|
||||
private String mySupId;
|
||||
|
||||
private int scanCount;
|
||||
|
||||
public String getSupId() {
|
||||
|
||||
if (supId == null) {
|
||||
return null;
|
||||
} else if (supId.equals(""))
|
||||
return null;
|
||||
return supId;
|
||||
}
|
||||
|
||||
public Integer getCount() {
|
||||
|
||||
if (count == null) {
|
||||
return 1;
|
||||
}
|
||||
if (count == 0)
|
||||
return 1;
|
||||
return count;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,85 @@
|
||||
package com.glxp.api.res.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UdiRlSupResponse {
|
||||
|
||||
private int id;
|
||||
private Integer rlId;
|
||||
private String thirdId;
|
||||
private String thirdName;
|
||||
private String uuid;
|
||||
private String originUuid;
|
||||
private String nameCode;
|
||||
private String packLevel;
|
||||
private String packRatio;
|
||||
private Integer bhxjsl;
|
||||
private Integer bhzxxsbzsl;
|
||||
private Integer zxxsbzbhsydysl;
|
||||
private String bhxjcpbm;
|
||||
private String sjcpbm; //
|
||||
private String bzcj;
|
||||
private String deviceRecordKey;
|
||||
private int isUseDy;
|
||||
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 int versionNumber;
|
||||
private int diType;
|
||||
|
||||
private String thirdId1;
|
||||
private String thirdId2;
|
||||
private String thirdId3;
|
||||
private String thirdId4;
|
||||
private String thirdName1;
|
||||
private String thirdName2;
|
||||
private String thirdName3;
|
||||
private String thirdName4;
|
||||
|
||||
private String ybbm;
|
||||
private String sptm;
|
||||
private String manufactory;
|
||||
private String measname;
|
||||
private Boolean isDisable;
|
||||
private long customerId;
|
||||
|
||||
private String auditStatus;
|
||||
private Boolean isLock;
|
||||
private Integer lockStatus;
|
||||
private String companyName;
|
||||
private String mainId;
|
||||
private String mainName;
|
||||
private Boolean isAdavence;
|
||||
|
||||
private String scbssfbhph;
|
||||
private String scbssfbhxlh;
|
||||
private String scbssfbhscrq;
|
||||
private String scbssfbhsxrq;
|
||||
private String cpms;
|
||||
private String supName;
|
||||
private boolean allowNoBatch;
|
||||
private boolean allowNoExpire;
|
||||
private boolean allowNoProduct;
|
||||
private String spmc;
|
||||
private Integer productType;
|
||||
private String price;
|
||||
|
||||
//产品代理商
|
||||
private String cpdls;
|
||||
private String basicPrductRemak1;
|
||||
private String basicPrductRemak2;
|
||||
private String basicPrductRemak3;
|
||||
private String basicPrductRemak4;
|
||||
private String basicPrductRemak5;
|
||||
private String basicPrductRemak6;
|
||||
private String basicPrductRemak7;
|
||||
private String basicPrductRemak8;
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.glxp.api.res.inout;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class AddCodeResult {
|
||||
private String orderId;
|
||||
private String errMsg;
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
package com.glxp.api.service.basic;
|
||||
|
||||
import com.glxp.api.entity.basic.UdiRlSupEntity;
|
||||
import com.glxp.api.entity.basic.UdiRelevanceEntity;
|
||||
import com.glxp.api.req.basic.UdiInfoExportRequest;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class CompanyProductsRelService {
|
||||
@Resource
|
||||
private UdiRlSupService udiRlSupService;
|
||||
@Resource
|
||||
UdiRelevanceService udiRelevanceService;
|
||||
|
||||
@Async
|
||||
public void insertCompanyProducts(UdiInfoExportRequest udiInfoExportRequest) {
|
||||
//选中导出
|
||||
if (udiInfoExportRequest.getRlIds() != null && udiInfoExportRequest.getRlIds().size() > 0) {
|
||||
List<String> rlIdS = udiInfoExportRequest.getRlIds();
|
||||
for (String uuid : rlIdS) {
|
||||
|
||||
UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity();
|
||||
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(Long.parseLong(uuid));
|
||||
// if (udiRelevanceEntity != null)
|
||||
// companyProductRelevanceEntity.setPrice(udiRelevanceEntity.getPrice());
|
||||
udiRlSupEntity.setCreateTime(new Date());
|
||||
udiRlSupEntity.setUpdateTime(new Date());
|
||||
udiRlSupEntity.setAuditStatus("3");
|
||||
udiRlSupEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
|
||||
udiRlSupEntity.setUdiRlIdFk(uuid);
|
||||
udiRlSupEntity.setCustomerId(udiInfoExportRequest.getUnitFk());
|
||||
boolean b = udiRlSupService.insertCompanyProductRelevance(udiRlSupEntity);
|
||||
}
|
||||
|
||||
} else {//一键导出 //todo暂时去掉
|
||||
// FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
|
||||
// BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest);
|
||||
// filterUdiInfoRequest.setPage(null);
|
||||
// List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
|
||||
// for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
|
||||
// CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
|
||||
// companyProductRelevanceEntity.setCreate_time(new Date());
|
||||
// companyProductRelevanceEntity.setUpdate_time(new Date());
|
||||
// companyProductRelevanceEntity.setAuditStatus("3");
|
||||
// companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
|
||||
// companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceResponse.getId());
|
||||
// companyProductRelevanceEntity.setProductUuid(udiRelevanceResponse.getUuid());
|
||||
// companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId());
|
||||
// boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package com.glxp.api.service.basic;
|
||||
|
||||
|
||||
import com.glxp.api.entity.basic.UdiRlSupEntity;
|
||||
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
|
||||
import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest;
|
||||
import com.glxp.api.res.basic.UdiRlSupResponse;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface UdiRlSupService {
|
||||
|
||||
List<UdiRlSupResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest);
|
||||
|
||||
List<UdiRlSupEntity> filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
|
||||
|
||||
UdiRlSupEntity findCompanyProductRelevance(String CustomerId);
|
||||
|
||||
UdiRlSupEntity findCompanyProductRelevanceByProductId(String productId);
|
||||
|
||||
UdiRlSupEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId);
|
||||
|
||||
UdiRlSupEntity findByUdiRlIdUnitFk(String udiRlIdFk, String unitFk);
|
||||
|
||||
UdiRlSupEntity findCompanyProductRelevanceByProductUuid(UdiRlSupEntity udiRlSupEntity);
|
||||
|
||||
List<UdiRlSupEntity> getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
|
||||
|
||||
int updateCompanyProductRelevance(UdiRlSupEntity companyCertEntity);
|
||||
|
||||
boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity);
|
||||
|
||||
boolean deleteById(String id);
|
||||
|
||||
boolean deleteByRlId(String id);
|
||||
}
|
||||
@ -0,0 +1,110 @@
|
||||
package com.glxp.api.service.basic.impl;
|
||||
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.basic.UdiRlSupDao;
|
||||
import com.glxp.api.entity.basic.UdiRlSupEntity;
|
||||
import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
|
||||
import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest;
|
||||
import com.glxp.api.res.basic.UdiRlSupResponse;
|
||||
import com.glxp.api.service.basic.UdiRlSupService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class UdiRlSupServiceImpl implements UdiRlSupService {
|
||||
|
||||
@Resource
|
||||
UdiRlSupDao udiRlSupDao;
|
||||
|
||||
@Override
|
||||
public List<UdiRlSupResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest) {
|
||||
if (basicInstrumentMaintainRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (basicInstrumentMaintainRequest.getPage() != null) {
|
||||
int offset = (basicInstrumentMaintainRequest.getPage() - 1) * basicInstrumentMaintainRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, basicInstrumentMaintainRequest.getLimit());
|
||||
}
|
||||
|
||||
List<UdiRlSupResponse> data = udiRlSupDao.filterUdiGp(basicInstrumentMaintainRequest);
|
||||
return data;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UdiRlSupEntity> filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest) {
|
||||
if (filterCompanyProductRelevanceRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (filterCompanyProductRelevanceRequest.getPage() != null) {
|
||||
int offset = (filterCompanyProductRelevanceRequest.getPage() - 1) * filterCompanyProductRelevanceRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterCompanyProductRelevanceRequest.getLimit());
|
||||
}
|
||||
return udiRlSupDao.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UdiRlSupEntity findCompanyProductRelevance(String CustomerId) {
|
||||
return udiRlSupDao.findCompanyProductRelevance(CustomerId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<UdiRlSupEntity> getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest) {
|
||||
if (filterCompanyProductRelevanceRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
int offset = (filterCompanyProductRelevanceRequest.getPage() - 1) * filterCompanyProductRelevanceRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, filterCompanyProductRelevanceRequest.getLimit());
|
||||
List<UdiRlSupEntity> companyEntities = udiRlSupDao.getCompanyProductRelevance(filterCompanyProductRelevanceRequest);
|
||||
return companyEntities;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UdiRlSupEntity findCompanyProductRelevanceByProductId(String productId) {
|
||||
return udiRlSupDao.findCompanyProductRelevanceByProductId(productId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UdiRlSupEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId) {
|
||||
return udiRlSupDao.findCompanyProductRelevanceByUdiRlIdFk(udiRlIdFk, customerId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UdiRlSupEntity findByUdiRlIdUnitFk(String udiRlIdFk, String unitFk) {
|
||||
FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest();
|
||||
filterCompanyProductRelevanceRequest.setUdiRlIdFk(udiRlIdFk);
|
||||
filterCompanyProductRelevanceRequest.setUnitFk(unitFk);
|
||||
List<UdiRlSupEntity> companyProductRelevanceEntities = udiRlSupDao.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
|
||||
if (companyProductRelevanceEntities.size() > 0) {
|
||||
return companyProductRelevanceEntities.get(0);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public UdiRlSupEntity findCompanyProductRelevanceByProductUuid(UdiRlSupEntity udiRlSupEntity) {
|
||||
return udiRlSupDao.findCompanyProductRelevanceByProductUuid(udiRlSupEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int updateCompanyProductRelevance(UdiRlSupEntity udiRlSupEntity) {
|
||||
return udiRlSupDao.updateById(udiRlSupEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertCompanyProductRelevance(UdiRlSupEntity udiRlSupEntity) {
|
||||
return udiRlSupDao.insertCompanyProductRelevance(udiRlSupEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteById(String id) {
|
||||
return udiRlSupDao.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean deleteByRlId(String id) {
|
||||
return udiRlSupDao.deleteByRlId(id);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.glxp.api.service.inout;
|
||||
|
||||
import com.glxp.api.entity.inout.IoCodeEnttity;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IoCodeService {
|
||||
|
||||
int insert(IoCodeEnttity codeEnttity);
|
||||
|
||||
boolean insertBatch(List<IoCodeEnttity> codeEnttities);
|
||||
|
||||
List<IoCodeEnttity> findByOrderId(String billNo);
|
||||
|
||||
int updateById(IoCodeEnttity codeEnttity);
|
||||
|
||||
public IoCodeEnttity findByUnique(String orderId, String code);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
package com.glxp.api.service.inout;
|
||||
|
||||
import com.glxp.api.entity.inout.IoOrderEntity;
|
||||
|
||||
public interface IoOrderService {
|
||||
|
||||
IoOrderEntity findById(String orderId);
|
||||
|
||||
IoOrderEntity findByBillNo(String billNO);
|
||||
|
||||
int insertOrder(IoOrderEntity orderEntity);
|
||||
}
|
||||
@ -0,0 +1,190 @@
|
||||
package com.glxp.api.service.inout;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.glxp.api.constant.Constant;
|
||||
import com.glxp.api.constant.ConstantStatus;
|
||||
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
|
||||
import com.glxp.api.entity.basic.UdiRlSupEntity;
|
||||
import com.glxp.api.entity.inout.IoCodeEnttity;
|
||||
import com.glxp.api.entity.inout.IoOrderEntity;
|
||||
import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest;
|
||||
import com.glxp.api.req.inout.PdaCodeEntity;
|
||||
import com.glxp.api.req.inout.PostOrderRequest;
|
||||
import com.glxp.api.service.basic.UdiRlSupService;
|
||||
import com.glxp.api.service.basic.IBasicBussinessTypeService;
|
||||
import com.glxp.api.util.DateUtil;
|
||||
import com.glxp.api.util.GennerOrderUtils;
|
||||
import com.glxp.api.util.OrderNoTypeBean;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class IoTransInoutService {
|
||||
|
||||
@Resource
|
||||
private IBasicBussinessTypeService basicBussinessTypeService;
|
||||
@Resource
|
||||
private IoOrderService orderService;
|
||||
@Resource
|
||||
GennerOrderUtils gennerOrderUtils;
|
||||
@Resource
|
||||
IoCodeService codeService;
|
||||
@Resource
|
||||
UdiRlSupService udiRlSupService;
|
||||
|
||||
public void creatOrderByPda(PostOrderRequest postOrderRequest) {
|
||||
List<PostOrderRequest.PostOrder> postOrders = postOrderRequest.getPostOrders();
|
||||
if (postOrders != null && postOrders.size() > 0) {
|
||||
for (int i = 0; i < postOrders.size(); i++) {
|
||||
PostOrderRequest.PostOrder postOrder = postOrders.get(i);
|
||||
List<PdaCodeEntity> pdaCodeEntities = postOrder.getCodes();
|
||||
if (pdaCodeEntities != null && pdaCodeEntities.size() > 0) {
|
||||
|
||||
//创建单据
|
||||
PdaCodeEntity pdaCodeEntity = pdaCodeEntities.get(0);
|
||||
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(pdaCodeEntity.getAction());
|
||||
String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd"));
|
||||
|
||||
IoOrderEntity orderSaveRequest = new IoOrderEntity();
|
||||
orderSaveRequest.setBillNo(orderNo);
|
||||
if (pdaCodeEntity.getActDate() != null) {
|
||||
orderSaveRequest.setCreateTime(DateUtil.parseDate(pdaCodeEntity.getActDate()));
|
||||
}
|
||||
orderSaveRequest.setMainAction(pdaCodeEntity.getMainAction());
|
||||
orderSaveRequest.setAction(pdaCodeEntity.getAction());
|
||||
orderSaveRequest.setCorpOrderId(pdaCodeEntity.getCorpOrderId());
|
||||
orderSaveRequest.setFromCorp(pdaCodeEntity.getFromCorpId());
|
||||
orderSaveRequest.setOutChangeEnable(postOrder.isOutChangeEnable());
|
||||
orderSaveRequest.setCustomerId(postOrderRequest.getCustomerId());
|
||||
orderSaveRequest.setFromInvCode(pdaCodeEntity.getFromSubInvCode());
|
||||
orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
|
||||
orderSaveRequest.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
|
||||
orderSaveRequest.setCreateUser(postOrderRequest.getUserId() + "");
|
||||
if (postOrder.getErpOrders() != null && postOrder.getErpOrders().size() > 0)
|
||||
orderSaveRequest.setFromType(ConstantStatus.FROM_PDAED);
|
||||
else
|
||||
orderSaveRequest.setFromType(ConstantStatus.FROM_PDAUN);
|
||||
orderService.insertOrder(orderSaveRequest);
|
||||
|
||||
|
||||
//写入条码
|
||||
List<IoCodeEnttity> ioCodeEnttities = new ArrayList<>();
|
||||
for (int index = 0; index < pdaCodeEntities.size(); index++) {
|
||||
pdaCodeEntities.get(index).setOrderId(orderNo);
|
||||
IoCodeEnttity codeEnttity = new IoCodeEnttity();
|
||||
BeanUtils.copyProperties(pdaCodeEntities.get(index), codeEnttity);
|
||||
ioCodeEnttities.add(codeEnttity);
|
||||
}
|
||||
codeService.insertBatch(ioCodeEnttities);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public String checkExitSup(Long relId) {
|
||||
//校验条码关联供应商
|
||||
FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest = new FilterCompanyProductRelevanceRequest();
|
||||
filterCompanyProductRelevanceRequest.setUdiRlIdFk(relId + "");
|
||||
List<UdiRlSupEntity> companyProductRelevanceEntities = udiRlSupService.filterCompanyProductRelevance(filterCompanyProductRelevanceRequest);
|
||||
if (companyProductRelevanceEntities != null && companyProductRelevanceEntities.size() == 1) {
|
||||
UdiRlSupEntity udiRlSupEntity = companyProductRelevanceEntities.get(0);
|
||||
return udiRlSupEntity.getUnitFk();
|
||||
} else if (companyProductRelevanceEntities != null && companyProductRelevanceEntities.size() > 1) {
|
||||
String unitFk = companyProductRelevanceEntities.get(0).getUnitFk();
|
||||
boolean isMuti = false;
|
||||
for (UdiRlSupEntity udiRlSupEntity : companyProductRelevanceEntities) {
|
||||
if (!unitFk.equals(udiRlSupEntity.getUnitFk())) {
|
||||
isMuti = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (isMuti)
|
||||
return "MUTI"; //绑定多个供应商
|
||||
else
|
||||
return unitFk;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public String checkInvExitSup(IoCodeEnttity codeEnttity) {
|
||||
|
||||
String supId = checkNorInv(codeEnttity);
|
||||
if (supId == null) {
|
||||
return checkPreInv(codeEnttity);
|
||||
}
|
||||
return supId;
|
||||
}
|
||||
|
||||
//查普通库存 todo
|
||||
public String checkNorInv(IoCodeEnttity codeEnttity) {
|
||||
|
||||
// FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
|
||||
// filterInvWarehouseRequest.setLevel(1);
|
||||
// filterInvWarehouseRequest.setAdvanceType(false);
|
||||
// List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
|
||||
// List<String> codes = new ArrayList<>();
|
||||
// if (!invWarehouseEntities.isEmpty()) {
|
||||
// for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
|
||||
// codes.add(invWarehouseEntity.getCode());
|
||||
// }
|
||||
// }
|
||||
// FilterInvProductRequest filterInvProductDetailRequest = new FilterInvProductRequest();
|
||||
// filterInvProductDetailRequest.setRelIdFk(codeEnttity.getRelId());
|
||||
// filterInvProductDetailRequest.setBatchNo(codeEnttity.getBatchNo());
|
||||
// filterInvProductDetailRequest.setInvCodes(codes);
|
||||
// List<InvProductEntity> invProductEntities = invProductService.filterInvProduct(filterInvProductDetailRequest);
|
||||
// if (invProductEntities.size() > 0) {
|
||||
// String supId = invProductEntities.get(0).getSupId();
|
||||
// int count = 0;
|
||||
// for (InvProductEntity invProductEntity : invProductEntities) {
|
||||
// if (!supId.equals(invProductEntity.getSupId())) {
|
||||
// return null;
|
||||
// }
|
||||
// count = count + (invProductEntity.getInCount() - invProductEntity.getOutCount());
|
||||
// }
|
||||
// if (count > 0)
|
||||
// return supId;
|
||||
// }
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
//查寄售库存 todo
|
||||
public String checkPreInv(IoCodeEnttity codeEnttity) {
|
||||
// FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
|
||||
// filterInvWarehouseRequest.setLevel(1);
|
||||
// filterInvWarehouseRequest.setAdvanceType(true);
|
||||
// List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
|
||||
// List<String> codes = new ArrayList<>();
|
||||
// if (!invWarehouseEntities.isEmpty()) {
|
||||
// for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
|
||||
// codes.add(invWarehouseEntity.getCode());
|
||||
// }
|
||||
// }
|
||||
// FilterInvProductRequest filterInvProductDetailRequest = new FilterInvProductRequest();
|
||||
// filterInvProductDetailRequest.setRelIdFk(codeEnttity.getRelId());
|
||||
// filterInvProductDetailRequest.setBatchNo(codeEnttity.getBatchNo());
|
||||
// filterInvProductDetailRequest.setInvCodes(codes);
|
||||
// List<InvProductEntity> invProductEntities = invPreProductService.filterInvProduct(filterInvProductDetailRequest);
|
||||
// if (invProductEntities.size() > 0) {
|
||||
// String supId = invProductEntities.get(0).getSupId();
|
||||
// int count = 0;
|
||||
// for (InvProductEntity invProductEntity : invProductEntities) {
|
||||
// if (!supId.equals(invProductEntity.getSupId())) {
|
||||
// return null;
|
||||
// }
|
||||
// count = count + (invProductEntity.getInCount() - invProductEntity.getOutCount());
|
||||
// }
|
||||
// if (count > 0)
|
||||
// return supId;
|
||||
// }
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
package com.glxp.api.service.inout.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.glxp.api.dao.inout.IoCodeDao;
|
||||
import com.glxp.api.entity.inout.IoCodeEnttity;
|
||||
import com.glxp.api.service.inout.IoCodeService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class IoCodeServiceImpl implements IoCodeService {
|
||||
|
||||
IoCodeDao ioCodeDao;
|
||||
|
||||
@Override
|
||||
public int insert(IoCodeEnttity codeEnttity) {
|
||||
return ioCodeDao.insert(codeEnttity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean insertBatch(List<IoCodeEnttity> codeEnttities) {
|
||||
return ioCodeDao.insertBatch(codeEnttities);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<IoCodeEnttity> findByOrderId(String billNo) {
|
||||
return ioCodeDao.selectList(new QueryWrapper<IoCodeEnttity>().eq("orderId", billNo));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int updateById(IoCodeEnttity codeEnttity) {
|
||||
return ioCodeDao.updateById(codeEnttity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IoCodeEnttity findByUnique(String orderId, String code) {
|
||||
return ioCodeDao.selectOne(new QueryWrapper<IoCodeEnttity>().eq("orderId", orderId).eq("code", code));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package com.glxp.api.service.inout.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.glxp.api.dao.inout.IoOrderDao;
|
||||
import com.glxp.api.entity.inout.IoOrderEntity;
|
||||
import com.glxp.api.service.inout.IoOrderService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@Service
|
||||
public class IoOrderServiceImpl implements IoOrderService {
|
||||
|
||||
@Resource
|
||||
IoOrderDao orderDao;
|
||||
|
||||
@Override
|
||||
public IoOrderEntity findById(String orderId) {
|
||||
return orderDao.selectById(orderId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IoOrderEntity findByBillNo(String billNO) {
|
||||
return orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNO));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int insertOrder(IoOrderEntity orderEntity) {
|
||||
return orderDao.insert(orderEntity);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package com.glxp.api.util.udi;
|
||||
|
||||
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
||||
import com.glxp.api.service.basic.UdiRelevanceService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@Service
|
||||
public class UdiCalCountUtil {
|
||||
|
||||
@Resource
|
||||
UdiRelevanceService udiRelevanceService;
|
||||
|
||||
|
||||
public int getActCount(Long relId) {
|
||||
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(relId);
|
||||
return getActCount(udiRelevanceResponse);
|
||||
}
|
||||
|
||||
public int getActCount(UdiRelevanceResponse udiRelevanceResponse) {
|
||||
int actCount;
|
||||
if (!udiRelevanceResponse.getIsUseDy() && udiRelevanceResponse.getDiType() != 2) {
|
||||
if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
|
||||
actCount = udiRelevanceResponse.getZxxsbzbhsydysl();
|
||||
} else {
|
||||
actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getZxxsbzbhsydysl();
|
||||
}
|
||||
} else {
|
||||
actCount = udiRelevanceResponse.getBhzxxsbzsl();
|
||||
}
|
||||
|
||||
return actCount;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,347 @@
|
||||
<?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.UdiRlSupDao">
|
||||
<select id="filterCompanyProductRelevance"
|
||||
parameterType="com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest"
|
||||
resultType="com.glxp.api.entity.basic.UdiRlSupEntity">
|
||||
select *
|
||||
from company_product_relevance
|
||||
<where>
|
||||
<if test="customerId != '' and customerId != null">
|
||||
and customerId = #{customerId}
|
||||
</if>
|
||||
<if test="udiRlIdFk != '' and udiRlIdFk != null">
|
||||
and udiRlIdFk = #{udiRlIdFk}
|
||||
</if>
|
||||
<if test="unitFk != null and unitFk != ''">
|
||||
and unitFk = #{unitFk}
|
||||
</if>
|
||||
<if test="lastUpdateTime != null and lastUpdateTime != ''">
|
||||
<![CDATA[
|
||||
and DATE_FORMAT(update_time, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
|
||||
]]>
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY id DESC
|
||||
</select>
|
||||
|
||||
|
||||
<select id="filterUdiGp" parameterType="com.glxp.api.req.basic.CompanyProductRelevanceRequest"
|
||||
resultType="com.glxp.api.res.basic.UdiRlSupResponse">
|
||||
select company_product_relevance.id,
|
||||
company_product_relevance.customerId,
|
||||
company_product_relevance.auditStatus,
|
||||
basic_udirel.thirdId,
|
||||
basic_udirel.thirdName,
|
||||
basic_udirel.id rlId,
|
||||
basic_udirel.isUseDy,
|
||||
basic_udirel.isLock,
|
||||
basic_udirel.thirdId1,
|
||||
basic_udirel.thirdId2,
|
||||
basic_udirel.thirdId3,
|
||||
basic_udirel.thirdId4,
|
||||
basic_udirel.thirdName1,
|
||||
basic_udirel.thirdName2,
|
||||
basic_udirel.thirdName3,
|
||||
basic_udirel.thirdName4,
|
||||
basic_udirel.ybbm,
|
||||
basic_udirel.sptm,
|
||||
basic_udirel.manufactory,
|
||||
basic_udirel.measname,
|
||||
basic_udirel.lockStatus,
|
||||
basic_products.allowNoBatch,
|
||||
basic_products.allowNoExpire,
|
||||
basic_products.allowNoProduct,
|
||||
basic_products.productType,
|
||||
basic_products.nameCode,
|
||||
basic_products.packRatio,
|
||||
basic_products.packLevel,
|
||||
basic_products.bhxjsl,
|
||||
basic_products.bhzxxsbzsl,
|
||||
basic_products.zxxsbzbhsydysl,
|
||||
basic_products.bhxjcpbm,
|
||||
basic_products.bzcj,
|
||||
basic_products.addType,
|
||||
basic_udirel.isDisable,
|
||||
basic_products.deviceRecordKey,
|
||||
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.uuid,
|
||||
basic_products.sjcpbm,
|
||||
basic_products.versionNumber,
|
||||
basic_products.diType,
|
||||
basic_corp.name companyName,
|
||||
basic_udirel.mainId,
|
||||
basic_udirel.mainName,
|
||||
basic_udirel.isAdavence,
|
||||
basic_products.scbssfbhph,
|
||||
basic_products.scbssfbhxlh,
|
||||
basic_products.scbssfbhscrq,
|
||||
basic_products.scbssfbhsxrq,
|
||||
basic_products.cpms,
|
||||
basic_products.originUuid,
|
||||
company_product_relevance.price
|
||||
,
|
||||
basic_products.spmc,
|
||||
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
|
||||
FROM company_product_relevance
|
||||
inner JOIN basic_udirel
|
||||
ON company_product_relevance.udiRlIdFk = basic_udirel.id
|
||||
inner JOIN basic_products
|
||||
ON basic_udirel.uuid = basic_products.uuid
|
||||
left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
|
||||
|
||||
<where>
|
||||
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
|
||||
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
|
||||
</if>
|
||||
<if test="cpmctymc != '' and cpmctymc != null">
|
||||
AND cpmctymc LIKE concat(#{cpmctymc}, '%')
|
||||
</if>
|
||||
<if test="nameCode != '' and nameCode != null">
|
||||
AND nameCode LIKE concat(#{nameCode}, '%')
|
||||
</if>
|
||||
<if test="ggxh != '' and ggxh != null">
|
||||
AND ggxh LIKE concat('%', #{ggxh}, '%')
|
||||
</if>
|
||||
<if test="unionCode != '' and unionCode != null">
|
||||
and (
|
||||
nameCode LIKE concat('%', #{unionCode}, '%')
|
||||
or basic_udirel.ybbm LIKE concat('%', #{unionCode}, '%')
|
||||
or basic_udirel.sptm LIKE concat('%', #{unionCode}, '%')
|
||||
)
|
||||
</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="uuid != '' and uuid != null">
|
||||
AND basic_udirel.uuid = #{uuid}
|
||||
</if>
|
||||
<if test="thirdId != '' and thirdId != null">
|
||||
AND basic_udirel.thirdId = #{thirdId}
|
||||
</if>
|
||||
<if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
|
||||
AND zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh}, '%')
|
||||
</if>
|
||||
<if test="diType != '' and diType != null">
|
||||
AND diType = #{diType}
|
||||
</if>
|
||||
<if test="filterType != null and filterType == 1">
|
||||
AND (basic_udirel.thirdId <![CDATA[<>]]> '' or basic_udirel.thirdId1 <![CDATA[<>]]> '' or
|
||||
basic_udirel.thirdId2 <![CDATA[<>]]> '' or
|
||||
basic_udirel.thirdId3 <![CDATA[<>]]> '' or basic_udirel.thirdId4 <![CDATA[<>]]> '')
|
||||
and basic_products.originUuid <![CDATA[<>]]> ''
|
||||
</if>
|
||||
<if test="filterType != null and filterType == 2">
|
||||
AND basic_products.originUuid is NULL
|
||||
</if>
|
||||
<if test="filterType != null and filterType == 3">
|
||||
AND basic_udirel.thirdId is NULL
|
||||
and basic_products.originUuid <![CDATA[<>]]> ''
|
||||
</if>
|
||||
<if test="filterType != null and filterType == 4">
|
||||
AND basic_udirel.thirdId1 is NULL
|
||||
and basic_products.originUuid <![CDATA[<>]]> ''
|
||||
</if>
|
||||
<if test="filterType != null and filterType == 5">
|
||||
AND basic_udirel.thirdId2 is NULL
|
||||
and basic_products.originUuid <![CDATA[<>]]> ''
|
||||
</if>
|
||||
<if test="filterType != null and filterType == 6">
|
||||
AND basic_udirel.thirdId3 is NULL
|
||||
and basic_products.originUuid <![CDATA[<>]]> ''
|
||||
</if>
|
||||
<if test="filterType != null and filterType == 7">
|
||||
AND basic_udirel.thirdId4 is NULL
|
||||
and basic_products.originUuid <![CDATA[<>]]> ''
|
||||
</if>
|
||||
<if test="filterType != null and filterType == 10">
|
||||
AND basic_udirel.updateTime is NULL
|
||||
</if>
|
||||
|
||||
<if test="customerId != '' and customerId != null">
|
||||
AND company_product_relevance.customerId = #{customerId}
|
||||
</if>
|
||||
<if test="auditStatus != '' and auditStatus != null">
|
||||
AND company_product_relevance.auditStatus = #{auditStatus}
|
||||
</if>
|
||||
<if test="id != '' and id != null">
|
||||
AND basic_udirel.id = #{id}
|
||||
</if>
|
||||
<if test="companyName != '' and companyName != null">
|
||||
AND basic_corp.name = #{companyName}
|
||||
</if>
|
||||
<if test="lockStatus != '' and lockStatus != null">
|
||||
AND basic_udirel.lockStatus = #{lockStatus}
|
||||
</if>
|
||||
<if test="isAdavence != '' and isAdavence != null">
|
||||
AND basic_udirel.isAdavence = #{isAdavence}
|
||||
</if>
|
||||
<if test="unitFk != null and unitFk != ''">
|
||||
and unitFk = #{unitFk}
|
||||
</if>
|
||||
<if test="isDisable == false">
|
||||
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY basic_udirel.updateTime DESC
|
||||
</select>
|
||||
|
||||
|
||||
<select id="findCompanyProductRelevance" parameterType="java.lang.Long"
|
||||
resultType="com.glxp.api.entity.basic.UdiRlSupEntity">
|
||||
SELECT *
|
||||
FROM company_product_relevance
|
||||
where customerId = #{customerId}
|
||||
</select>
|
||||
|
||||
<select id="findCompanyProductRelevanceByProductId" parameterType="java.lang.String"
|
||||
resultType="com.glxp.api.entity.basic.UdiRlSupEntity">
|
||||
SELECT *
|
||||
FROM company_product_relevance
|
||||
where productId = #{productId}
|
||||
</select>
|
||||
|
||||
<select id="findCompanyProductRelevanceByUdiRlIdFk" parameterType="java.lang.String"
|
||||
resultType="com.glxp.api.entity.basic.UdiRlSupEntity">
|
||||
SELECT *
|
||||
FROM company_product_relevance
|
||||
where udiRlIdFk = #{udiRlIdFk}
|
||||
and customerId = #{customerId}
|
||||
</select>
|
||||
|
||||
|
||||
<select id="findCompanyProductRelevanceByProductUuid"
|
||||
parameterType="com.glxp.api.entity.basic.UdiRlSupEntity"
|
||||
resultType="com.glxp.api.entity.basic.UdiRlSupEntity">
|
||||
SELECT *
|
||||
FROM company_product_relevance
|
||||
<where>
|
||||
<if test="customerId != null and customerId != ''">
|
||||
and customerId = #{customerId}
|
||||
</if>
|
||||
<if test="productId != null and productId != ''">
|
||||
and productId = #{productId}
|
||||
</if>
|
||||
<if test="productUuid != null and productUuid != ''">
|
||||
and productUuid = #{productUuid}
|
||||
</if>
|
||||
<if test="unitFk != null and unitFk != ''">
|
||||
and unitFk = #{unitFk}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="getCompanyProductRelevance"
|
||||
parameterType="com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest"
|
||||
resultType="com.glxp.api.entity.basic.UdiRlSupEntity">
|
||||
SELECT *
|
||||
FROM company_product_relevance
|
||||
<where>
|
||||
<if test="customerId != null and customerId != ''">
|
||||
and customerId = #{customerId}
|
||||
</if>
|
||||
<if test="productId != null and productId != ''">
|
||||
and productId = #{productId}
|
||||
</if>
|
||||
<if test="productUuid != null and productUuid != ''">
|
||||
and productUuid = #{productUuid}
|
||||
</if>
|
||||
<if test="unitFk != null and unitFk != ''">
|
||||
and unitFk = #{unitFk}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertCompanyProductRelevance"
|
||||
parameterType="com.glxp.api.entity.basic.UdiRlSupEntity">
|
||||
replace
|
||||
INTO company_product_relevance(customerId,productId,enterpriseId,registrationId,
|
||||
createTime,updateTime,auditStatus,productUuid,udiRlIdFk,unitFk,price,createUser,updateUser) values
|
||||
(
|
||||
#{customerId},
|
||||
#{productId},
|
||||
#{enterpriseId},
|
||||
#{registrationId},
|
||||
#{createTime},
|
||||
#{updateTime},
|
||||
#{auditStatus},
|
||||
#{productUuid},
|
||||
#{udiRlIdFk},
|
||||
#{unitFk},
|
||||
#{price},
|
||||
#{createUser},
|
||||
#{updateUser}
|
||||
)
|
||||
</insert>
|
||||
|
||||
|
||||
<insert id="importCompanyProductRelevance"
|
||||
parameterType="com.glxp.api.entity.basic.UdiRlSupEntity">
|
||||
replace
|
||||
INTO company_product_relevance(id,customerId,productId,enterpriseId,registrationId,
|
||||
createTime,updateTime,auditStatus,productUuid,udiRlIdFk,unitFk,price,createUser,updateUser) values
|
||||
(
|
||||
#{id},
|
||||
#{customerId},
|
||||
#{productId},
|
||||
#{enterpriseId},
|
||||
#{registrationId},
|
||||
#{createTime},
|
||||
#{updateTime},
|
||||
#{auditStatus},
|
||||
#{productUuid},
|
||||
#{udiRlIdFk},
|
||||
#{unitFk},
|
||||
#{price},
|
||||
#{createUser},
|
||||
#{updateUser}
|
||||
)
|
||||
</insert>
|
||||
|
||||
<delete id="deleteById" parameterType="Map">
|
||||
DELETE
|
||||
FROM company_product_relevance
|
||||
WHERE id = #{id}
|
||||
</delete>
|
||||
|
||||
|
||||
<delete id="deleteByRlId" parameterType="Map">
|
||||
DELETE
|
||||
FROM company_product_relevance
|
||||
WHERE udiRlIdFk = #{id}
|
||||
</delete>
|
||||
|
||||
<select id="selectUnitFkByUdiRlIdFk" resultType="java.lang.String">
|
||||
select unitFk
|
||||
from company_product_relevance
|
||||
where udiRlIdFk = #{udiRlIdFk}
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.glxp.api.dao.inout.IoOrderDao">
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue