同步 内部码

master
wangwei 2 years ago
parent bbb845f1bc
commit 1524185bc6

@ -0,0 +1,151 @@
package com.glxp.api.constant;
import cn.hutool.core.collection.CollUtil;
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.basic.ProductInfoEntity;
import com.glxp.api.entity.basic.UdiCompanyEntity;
import com.glxp.api.service.basic.ProductInfoService;
import com.glxp.api.util.HttpClient;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
public class AsyncDiDlHelper {
@Value("${UDI_SERVER_URL}")
private String udiUrl;
public List<ProductInfoEntity> dlByTime(String udiUrl, int page, int limit, String updateTime) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("updateTime", updateTime);
String response = HttpClient.mipsGet(udiUrl + "/udidl/udiwms/syncUdi", paramMap);
try {
BaseResponse<List<ProductInfoEntity>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {
});
List<ProductInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData();
return udiInfoEntities;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
public List<UdiCompanyEntity> dlCompanyByTime(String udiUrl, int page, int limit, String updateTime) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("page", page);
paramMap.put("limit", limit);
paramMap.put("updateTime", updateTime);
String response = HttpClient.mipsGet(udiUrl + "/udidl/udiwms/syncCompany", paramMap);
try {
BaseResponse<List<UdiCompanyEntity>> baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<UdiCompanyEntity>>>() {
});
List<UdiCompanyEntity> udiCompanyEntities = baseResponse.getData();
return udiCompanyEntities;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
public List<ProductInfoEntity> dlByDi(String deviceId) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("deviceId", deviceId);
String response = HttpClient.mipsGet(udiUrl + "/udidl/device/serchDlByDi", paramMap);
try {
BaseResponse<List<ProductInfoEntity>> baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {
});
if (baseResponse.getCode() == 200000) {
List<ProductInfoEntity> productInfoEntityList = baseResponse.getData();
return productInfoEntityList;
} else {
return null;
}
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
public BaseResponse<List<ProductInfoEntity>> dlByDiRes(String deviceId) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("deviceId", deviceId);
String response = HttpClient.mipsGet(udiUrl + "/udidl/device/serchDlByDi", paramMap);
try {
BaseResponse<List<ProductInfoEntity>> baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {
});
return baseResponse;
} catch (Exception e) {
e.printStackTrace();
return ResultVOUtils.error(500, "连接UDI国家数据库下载出错");
}
}
public BaseResponse<List<ProductInfoEntity>> dlLastVersionByDi(String deviceId) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("deviceId", deviceId);
String response = HttpClient.mipsGet(udiUrl + "/udidl/device/dlLastVersionByDi", paramMap);
try {
BaseResponse<List<ProductInfoEntity>> baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {
});
return baseResponse;
} catch (Exception e) {
e.printStackTrace();
return ResultVOUtils.error(500, "连接UDI国家数据库下载出错");
}
}
@Resource
ProductInfoService productInfoService;
@Async
public void dlByUuid(String uuid) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("uuid", uuid);
String response = HttpClient.mipsGet(udiUrl + "/udidl/device/searchDlByUuid", paramMap);
try {
BaseResponse<List<ProductInfoEntity>> baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<List<ProductInfoEntity>>>() {
});
if (baseResponse != null && baseResponse.getCode() == 20000) {
List<ProductInfoEntity> productInfoEntityList = baseResponse.getData();
if (CollUtil.isNotEmpty(productInfoEntityList)) {
productInfoService.insertProductInfos(productInfoEntityList);
}
} else {
log.error("下载出错");
}
} catch (Exception e) {
e.printStackTrace();
}
}
}

@ -42,4 +42,12 @@ public class BaseController {
return authAdmin.getCustomerId() + "";
}
public boolean isHosUser() {
String customerId = getCustomerId();
if (customerId.equals("110")) {
return true;
}
return false;
}
}

@ -12,13 +12,12 @@ import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.basic.*;
import com.glxp.api.entity.inv.InvProductEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.entity.thrsys.ThrProductsEntity;
import com.glxp.api.entity.thrsys.ThrSystemEntity;
import com.glxp.api.req.basic.UdiCombineRequest;
import com.glxp.api.req.basic.FilterUdiRelRequest;
import com.glxp.api.req.basic.LockUdiRequest;
import com.glxp.api.req.basic.UdiCombineRequest;
import com.glxp.api.req.basic.UdiRelevanceSaveRequest;
import com.glxp.api.req.system.DeleteRequest;
import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest;
@ -35,7 +34,6 @@ import com.glxp.api.service.thrsys.ThrDataService;
import com.glxp.api.service.thrsys.ThrSystemService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.udi.FilterUdiUtils;
import com.glxp.api.util.udi.UdiInfoUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
@ -695,18 +693,5 @@ public class UdiRelevanceController extends BaseController {
return ResultVOUtils.success(ggxhList);
}
//资质证书选入产品列表 产品名称,生产企业过滤
@AuthRuleAnnotation("")
@GetMapping("/udi/cert/filterUdi")
public BaseResponse filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) {
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterCertUdi(filterUdiRelRequest);
PageInfo<UdiRelevanceResponse> pageInfo;
pageInfo = new PageInfo<>(udiRelevanceResponses);
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(udiRelevanceResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -11,8 +11,10 @@ import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.controller.BaseController;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.basic.*;
import com.glxp.api.entity.system.CompanyEntity;
import com.glxp.api.entity.basic.BasicCorpEntity;
import com.glxp.api.entity.basic.UdiEntity;
import com.glxp.api.entity.basic.UdiRelevanceEntity;
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;
@ -22,13 +24,13 @@ 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.CompanyProductRelevanceResponse;
import com.glxp.api.res.basic.UdiRlSupResponse;
import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.res.basic.UdiRlSupResponse;
import com.glxp.api.service.auth.AuthAdminService;
import com.glxp.api.service.basic.*;
import com.glxp.api.service.system.CompanyService;
import com.glxp.api.util.SupplementVailUtil;
import com.glxp.api.util.udi.FilterUdiUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -64,6 +66,8 @@ public class UdiRlSupController extends BaseController {
@Resource
private CompanyProductRelevanceService companyProductRelevanceService;
@Resource
private SupplementVailUtil supplementVailUtil;
@Resource
private UdiProductService udiProductService;
@AuthRuleAnnotation("")

@ -6,7 +6,9 @@ import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.AsyncDiDlHelper;
import com.glxp.api.entity.basic.*;
import com.glxp.api.req.basic.*;
import com.glxp.api.http.sync.SpGetHttpClient;
import com.glxp.api.req.basic.*;
import com.glxp.api.res.PageSimpleResponse;
@ -36,6 +38,8 @@ public class UdiSyncController {
@Resource
SyncUdiService syncUdiService;
@Resource
AsyncDiDlHelper asyncDiDlHelper;
@Resource
ProductInfoService productInfoService;
@Resource
UdiCompanyService udiCompanyService;
@ -180,3 +184,4 @@ public class UdiSyncController {
}
}

@ -3,18 +3,23 @@ package com.glxp.api.controller.inv;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.annotation.RepeatSubmit;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.constant.Constant;
import com.glxp.api.entity.inv.InnerOrderDetailEntity;
import com.glxp.api.entity.inv.InnerOrderEntity;
import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
import com.glxp.api.req.inv.InnerOrderDetailRequest;
import com.glxp.api.req.inv.InnerOrderRequest;
import com.glxp.api.req.inv.PostInnerOrderRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.inout.IoOrderDetailBizResponse;
import com.glxp.api.res.inv.innerOrderDetailResponse;
import com.glxp.api.service.auth.CustomerService;
import com.glxp.api.service.inout.IoOrderDetailBizService;
import com.glxp.api.service.inv.InnerOrderDetailService;
import com.glxp.api.service.inv.InnerOrderService;
import com.glxp.api.util.GennerOrderUtils;
@ -50,6 +55,8 @@ public class InnerOrderController {
CustomerService customerService;
@Resource
GennerOrderUtils gennerOrderUtils;
@Resource
IoOrderDetailBizService ioOrderDetailBizService;
/**
*
@ -57,6 +64,7 @@ public class InnerOrderController {
@RepeatSubmit()
@AuthRuleAnnotation("")
@PostMapping("/postOrder")
@Log(title = "内部码", businessType = BusinessType.INSERT)
public BaseResponse postOrder(@RequestBody PostInnerOrderRequest postInnerOrderRequest) {
long userId = customerService.getUserId();
@ -74,7 +82,7 @@ public class InnerOrderController {
} else {
innerOrderService.update(innerOrderEntity);
}
return ResultVOUtils.success(innerOrderEntity.getId());
return ResultVOUtils.success(innerOrderEntity);
}
@ -100,6 +108,7 @@ public class InnerOrderController {
*/
@RepeatSubmit()
@PostMapping()
@Log(title = "内部码", businessType = BusinessType.INSERT)
public BaseResponse add(@RequestBody InnerOrderEntity innerOrderEntity) {
innerOrderService.insert(innerOrderEntity);
@ -111,6 +120,7 @@ public class InnerOrderController {
*/
@RepeatSubmit()
@PutMapping()
@Log(title = "内部码", businessType = BusinessType.UPDATE)
public BaseResponse edit(@RequestBody InnerOrderEntity innerOrderEntity) {
innerOrderService.update(innerOrderEntity);
return ResultVOUtils.success("删除成功");
@ -122,6 +132,7 @@ public class InnerOrderController {
* @param ids
*/
@DeleteMapping("/{ids}")
@Log(title = "内部码", businessType = BusinessType.DELETE)
public BaseResponse remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
List<String> idArray = Arrays.asList(ids);
@ -158,17 +169,45 @@ public class InnerOrderController {
*/
@RepeatSubmit()
@PostMapping("/insertDetail")
@Log(title = "内部码", businessType = BusinessType.INSERT)
public BaseResponse detailAdd(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) {
innerOrderDetailService.insert(innerOrderDetailEntity);
return ResultVOUtils.success("");
}
/**
*
*/
@RepeatSubmit()
@PostMapping("/orderDetailAdd")
@Log(title = "内部码", businessType = BusinessType.INSERT)
public BaseResponse orderDetailAdd(@RequestBody InnerOrderDetailRequest innerOrderDetailRequest) {
InnerOrderDetailEntity innerOrderDetailEntity=new InnerOrderDetailEntity();
//查询业务单
FilterOrderDetailBizRequest filterOrderDetailBizRequest=new FilterOrderDetailBizRequest();
filterOrderDetailBizRequest.setOrderIdFk(innerOrderDetailRequest.getBillNo());
List<IoOrderDetailBizResponse> ioOrderDetailBizResponseList = ioOrderDetailBizService.filterList(filterOrderDetailBizRequest);
for (IoOrderDetailBizResponse ioOrderDetailBizResponse : ioOrderDetailBizResponseList) {
innerOrderDetailEntity.setOrderIdFk(innerOrderDetailRequest.getOrderIdFk());
innerOrderDetailEntity.setProductId(ioOrderDetailBizResponse.getBindRlFk()+"");
innerOrderDetailEntity.setProductName(ioOrderDetailBizResponse.getCoName());
innerOrderDetailEntity.setProductDate(ioOrderDetailBizResponse.getProductDate());
innerOrderDetailEntity.setExpireDate(ioOrderDetailBizResponse.getExpireDate());
innerOrderDetailEntity.setBatchNo(ioOrderDetailBizResponse.getBatchNo());
innerOrderDetailEntity.setCount(ioOrderDetailBizResponse.getCount());
innerOrderDetailService.insert(innerOrderDetailEntity);
}
return ResultVOUtils.success("");
}
/**
*
*/
@RepeatSubmit()
@PostMapping("/updateDetail")
@Log(title = "内部码", businessType = BusinessType.UPDATE)
public BaseResponse detailEdit(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) {
innerOrderDetailService.update(innerOrderDetailEntity);
return ResultVOUtils.success("更新成功");
@ -180,6 +219,7 @@ public class InnerOrderController {
* @param ids
*/
@DeleteMapping("/detail/{ids}")
@Log(title = "内部码", businessType = BusinessType.DELETE)
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {

@ -2,17 +2,24 @@ package com.glxp.api.controller.inv;
import com.github.pagehelper.PageInfo;
import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.annotation.Log;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
import com.glxp.api.constant.BusinessType;
import com.glxp.api.entity.inout.IoOrderEntity;
import com.glxp.api.entity.inv.InnerOrderEntity;
import com.glxp.api.entity.inv.InvInnerOrderPrintEntity;
import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
import com.glxp.api.entity.system.SystemPDFModuleEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
import com.glxp.api.req.inv.*;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.inv.InnerOrderPrintResponse;
import com.glxp.api.service.inout.IoOrderService;
import com.glxp.api.service.inv.InnerOrderService;
import com.glxp.api.service.inv.InvInnerOrderPdfTempService;
import com.glxp.api.service.inv.InvInnerOrderPrintService;
import com.glxp.api.service.inv.JaspaperService;
@ -33,10 +40,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@RestController
public class InvInnerOrderPrintController {
@ -54,19 +58,24 @@ public class InvInnerOrderPrintController {
private JaspaperService jaspaperService;
@Resource
private InvInnerOrderPdfTempService innerOrderPdfTempService;
@Resource
private IoOrderService ioOrderService;
@Resource
private InnerOrderService innerOrderService;
@GetMapping("/udiwms/innerOrderPrint/filter")
public BaseResponse filterList(FilterinnerOrderprintRequest filterinnerOrderprintRequest) {
List<InvInnerOrderPrintEntity> list = invInnerOrderPrintService.filterOrderPrintList(filterinnerOrderprintRequest);
PageInfo<InvInnerOrderPrintEntity> pageInfo = new PageInfo<>(list);
PageSimpleResponse<InvInnerOrderPrintEntity> pageSimpleResponse = new PageSimpleResponse<>();
List<InnerOrderPrintResponse> list = invInnerOrderPrintService.filterJoinInnerPrint(filterinnerOrderprintRequest);
PageInfo<InnerOrderPrintResponse> pageInfo = new PageInfo<>(list);
PageSimpleResponse<InnerOrderPrintResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(pageInfo.getList());
return ResultVOUtils.success(pageSimpleResponse);
}
@PostMapping("/udiwms/innerOrderPrint/addOrderPrint")
@Log(title = "内部码", businessType = BusinessType.INSERT)
public BaseResponse addOrderPrint(@RequestBody invInnerOrderprintReques invInnerOrderprintReques) {
if (invInnerOrderprintReques.getOrderIdFk() != null) {
@ -84,12 +93,12 @@ public class InvInnerOrderPrintController {
public BaseResponse inspectionStockQRCodeTextPDFFromTemplateFile(
@RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception {
if (inspectionPDFTemplateRequest.getModuleId() == null)
inspectionPDFTemplateRequest.setModuleId(3);
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(inspectionPDFTemplateRequest.getModuleId() + "");
if (systemPDFModuleEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(inspectionPDFTemplateRequest.getLabelId() + "");
if (sysPdfTemplateRelevanceLabelEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置,请检查");
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
return ResultVOUtils.success();
@ -100,13 +109,15 @@ public class InvInnerOrderPrintController {
public BaseResponse stockQRCodeTextPDFFromTemplateFile(
@RequestBody InnerOrderQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest,
HttpServletRequest request, HttpServletResponse response) throws Exception {
if (stockQRCodeTextPDFTemplateRequest.getModuleId() == null)
stockQRCodeTextPDFTemplateRequest.setModuleId(3);
SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(stockQRCodeTextPDFTemplateRequest.getModuleId() + "");
if (systemPDFModuleEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置,请检查");
SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(stockQRCodeTextPDFTemplateRequest.getLabelId() + "");
if (sysPdfTemplateRelevanceLabelEntity == null) return ResultVOUtils.error(500, "未找到单据模板模块设置,请检查");
SystemPDFTemplateEntity systemPDFTemplateEntity =
systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return null;
systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId()));
if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
List<InnerOrderPrintResponse> printEntities = new ArrayList<>();
List<InnerOrderPrintResponse> mStockPrintEntities = new ArrayList<>();
FilterinnerOrderprintRequest filterinnerOrderprintRequest = new FilterinnerOrderprintRequest();
@ -119,16 +130,16 @@ public class InvInnerOrderPrintController {
if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
mStockPrintEntities.addAll(stockPrintEntities);
}
for (InnerOrderPrintResponse innerOrderPrintRequest : mStockPrintEntities) {
PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), innerOrderPrintRequest);
for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) {
PdfPrintCountEntity pdfPrintCount = getCount(stockQRCodeTextPDFTemplateRequest.getCountList(), InnerOrderPrintResponse);
if (pdfPrintCount != null && pdfPrintCount.getRowCount() > 0) {
for (int i = 0; i < pdfPrintCount.getRowCount(); i++) {
InnerOrderPrintResponse clone = new InnerOrderPrintResponse();
BeanUtils.copyProperties(innerOrderPrintRequest, clone);
BeanUtils.copyProperties(InnerOrderPrintResponse, clone);
printEntities.add(clone);
}
} else {
printEntities.add(innerOrderPrintRequest);
printEntities.add(InnerOrderPrintResponse);
}
}
@ -175,19 +186,40 @@ public class InvInnerOrderPrintController {
}
for (InnerOrderPrintResponse innerOrderPrintRequest : mStockPrintEntities) {
String orderId="";
for (InnerOrderPrintResponse InnerOrderPrintResponse : mStockPrintEntities) {
InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity();
innerOrderPrintEntity.setStatus(1);
innerOrderPrintEntity.setId(innerOrderPrintRequest.getId());
innerOrderPrintEntity.setId(InnerOrderPrintResponse.getId());
invInnerOrderPrintService.updateOrder(innerOrderPrintEntity);
orderId=InnerOrderPrintResponse.getId()+"";
}
//查询订单id
InvInnerOrderPrintEntity innerOrderPrintEntity=invInnerOrderPrintService.selectById(orderId);
//更新内部码状态
InnerOrderEntity innerOrderEntity=innerOrderService.findByRecordKey(innerOrderPrintEntity.getOrderIdFk());
if(innerOrderEntity!=null){
innerOrderEntity.setGenStatus(2);
innerOrderEntity.setId(innerOrderEntity.getId());
innerOrderService.update(innerOrderEntity);
}
IoOrderEntity ioOrderEntity=new IoOrderEntity();
ioOrderEntity.setInCodeStatus(1);
ioOrderEntity.setBillNo(innerOrderPrintEntity.getOrderIdFk());
ioOrderService.updateByBillNo(ioOrderEntity);
return null;
}
public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, InnerOrderPrintResponse innerOrderPrintRequest) {
public PdfPrintCountEntity getCount(List<PdfPrintCountEntity> countList, InnerOrderPrintResponse InnerOrderPrintResponse) {
for (PdfPrintCountEntity pdfPrintCount : countList) {
if (pdfPrintCount.getQueryId().equals(innerOrderPrintRequest.getId() + "")) {
if (pdfPrintCount.getQueryId().equals(InnerOrderPrintResponse.getId() + "")) {
return pdfPrintCount;
}
}

@ -0,0 +1,17 @@
package com.glxp.api.dao.basic;
import com.glxp.api.entity.basic.BasicProductSetEntity;
import com.glxp.api.req.basic.FilterBasicProductSetrequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface BasicProductSetDao {
List<BasicProductSetEntity> filterSetup(FilterBasicProductSetrequest filterBasicProductSetrequest);
boolean updateSetup(BasicProductSetEntity basicProductSetEntity);
}

@ -19,8 +19,6 @@ public interface UdiRelevanceDao extends BaseMapperPlus<UdiRelevanceDao, UdiRele
List<UdiRelevanceResponse> filterCertUdi(FilterUdiRelRequest filterUdiRelRequest);
List<UdiRelevanceResponse> filterCertUdi(FilterUdiRelRequest filterUdiRelRequest);
List<UdiRelevanceResponse> filterUdiGp(FilterUdiRelRequest filterUdiRelRequest);
// UdiRelevanceResponse selectUdiByUUid

@ -1,5 +1,7 @@
package com.glxp.api.dao.system;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity;
import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest;
@ -50,6 +52,11 @@ public interface SystemPDFTemplateRelevanceDao {
boolean insert(SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity);
SysPdfTemplateRelevanceLabelEntity selectByLabelId(String id);
SysPdfTemplateRelevanceStatemenEntity selectByStatemenId(String id);
/**
* customerId
@ -62,5 +69,5 @@ public interface SystemPDFTemplateRelevanceDao {
SystemPDFTemplateRelevanceEntity selectModuleldAndAction(@Param("moduleId") Integer moduleId,@Param("localAction") String localAction);
SysPdfTemplateRelevanceStatemenEntity selectByStatemenId(String id);
SysPdfTemplateRelevanceCodeEntity selectNameAndAction(@Param("name") String name, @Param("localAction") String localAction);
}

@ -0,0 +1,48 @@
package com.glxp.api.dao.thrsys;
import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity;
import com.glxp.api.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.res.thrsys.ThrProductsAddDiResponse;
import com.glxp.api.res.thrsys.UdiInfoResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface ThrProductsAddDiDao {
/**
*
*
* @param list
* @return
*/
boolean insertThrDiProducts(@Param("list") List<ThrProductsAddDiEntity> list);
/**
* ID
*
* @param id
* @return
*/
boolean deleteById(Long id);
List<ThrProductsAddDiResponse> filterThrProductsList(FilterThrProductsRequest filterThrProductsRequest);
boolean updateDiProduct(ThrProductsAddDiEntity thrProductsAddDiEntity);
UdiInfoResponse getDiProductDetail(@Param("uuid") String uuid);
/** 根据ID查询 */
ThrProductsAddDiEntity filterThrProductsGetId(@Param("id") Integer id);
ThrProductsAddDiEntity filterThrProductsGetUuid(@Param("uuid") String uuid);
boolean insert(ThrProductsAddDiEntity thrProductsAddDiEntity);
List<ThrProductsAddDiResponse> filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest);
List<ThrProductsAddDiEntity> filterThrProductsDiLists(FilterThrProductsRequest filterThrProductsRequest);
}

@ -0,0 +1,25 @@
package com.glxp.api.entity.basic;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@Data
@TableName(value = "basic_product_set")
public class BasicProductSetEntity {
@TableId(type = IdType.AUTO)
private Integer id;
private String parmName;
private String parmKey;
private boolean enable;
private boolean supSelect;
private boolean supAdd;
private boolean localAdd;
private boolean localEdit;
private String remark;
private Integer sort;
}

@ -0,0 +1,101 @@
package com.glxp.api.entity.thrsys;
import lombok.Data;
import java.util.Date;
/**
* DI
*/
@Data
public class ThrProductsAddDiEntity {
private Long id;
/**
* UUID
*/
private String uuid;
/**
* ID
*/
private String customerId;
/**
*
*/
private Date createTime;
/**
*
*/
private Date auditTime;
/**
*
*/
private String auditUser;
/**
*
*/
private int status;
/**
*
*/
private String remark;
private String thirdSysFk;
private String code;
private String sptm;
private String ybbm;
private String measname;
private String manufactory;
private String spmc;
private String cpms;
private String selectThridSysStr;
private String price;
private String basicPrductRemak1;
private String basicPrductRemak2;
private String basicPrductRemak3;
private String basicPrductRemak4;
private String basicPrductRemak5;
private String basicPrductRemak6;
private String basicPrductRemak7;
private String basicPrductRemak8;
private String name;
private String spec;
private String registerNo;
private String thirdName;
private String cplb;
private String flbm;
private String qxlb;
private String tyshxydm;
private String zczbhhzbapzbh;
private String ylqxzcrbarmc;
private String ylqxzcrbarywmc;
private Date updateTime;
private String supName;
private boolean isChecked;
private String corpName;
//添加字段
private String model; //型号
private String standard; //规格型号,二合一字段
private String qtbm; //其他编码
private String zczyxqz; //注册有效期截止时间
private Integer checkStatus;
private String thirdSys;
private String relId;
private String nameCode;
private Integer type;
}

@ -0,0 +1,14 @@
package com.glxp.api.req.basic;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
@Data
public class FilterBasicProductSetrequest extends ListPageRequest {
String parmName;
Boolean enable;
}

@ -0,0 +1,25 @@
package com.glxp.api.req.basic;
import lombok.Data;
//选入产品补充信息
@Data
public class SupplementRequest {
//补充信息:
private String basicPrductRemak1;
private String basicPrductRemak2;
private String basicPrductRemak3;
private String basicPrductRemak4;
private String basicPrductRemak5;
private String basicPrductRemak6;
private String basicPrductRemak7;
private String basicPrductRemak8;
private String sptm;
private String ybbm;
private String measname;
private String manufactory;
private String spmc;
private String cpms;
private String price;
}

@ -23,5 +23,7 @@ public class UdiInfoExportRequest extends ListPageRequest {
private String thirdId2;
private String thirdId3;
private String thirdId4;
private String price;
private SupplementRequest supplementRequest;
}

@ -13,6 +13,9 @@ public class InspectionPDFTemplateRequest {
private String orderId;
private Long customerId;
private Integer moduleId;
private String modelKey;
private Integer labelId;
}

@ -8,5 +8,6 @@ public class InnerOrderDetailRequest extends ListPageRequest {
private String orderIdFk;
private String productId;
private String billNo;
}

@ -23,5 +23,6 @@ public class InnerOrderQRCodeTextPDFTemplateRequest {
private String orderName;
private Integer moduleId;
private Integer labelId;
}

@ -0,0 +1,49 @@
package com.glxp.api.req.thrsys;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* DI
*/
@Data
public class AddThrDiProductsRequest {
/**
* UUID
*/
@NotEmpty(message = "请选择需要添加的产品")
private List<String> uuids;
/**
* ID
*/
@NotNull(message = "参数错误")
private Long customerId;
private String thirdSysFk;
private String code;
private String sptm;
private String ybbm;
private String measname;
private String manufactory;
private String spmc;
private String cpms;
private String price;
private List<String> selectThirdSys;
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,50 @@
package com.glxp.api.res.thrsys;
import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity;
import lombok.Data;
/**
* DI
*/
@Data
public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity {
private Long id;
private String uuid;
private String nameCode;
private String cpmctymc;
private String ggxh;
private String ylqxzcrbarmc;
private String zczbhhzbapzbh;
private int status;
private String customerId;
private String remark;
private String companyName;
/**
*
*/
private String standard;
private String price;
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,443 @@
package com.glxp.api.res.thrsys;
import cn.hutool.core.util.StrUtil;
import lombok.Data;
@Data
public class UdiInfoResponse {
private Integer id;
private String nameCode;
private String packRatio;
private String packLevel;
private Integer bhxjsl;
private Integer bhzxxsbzsl;
private Integer zxxsbzbhsydysl;
private String bhxjcpbm;
private String sjcpbm; //
private String bzcj;
private String addType;
private String deviceRecordKey;
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 uuid;
private Integer versionNumber;
private Integer diType;
private String thirdId;
private String thirdName;
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 String spmc;
private String originUuid;
//本地生成信息
private String batchNo;
private String produceDate;
private String expireDate;
private String serialNo;
private String udi;
private String code;
private Integer count;
private String warehouseCode;
private String udplatCode;
private String relId;//关联ID主键
private Integer status;
private String supId;
private boolean isAdavence;
private boolean isDisable;
private boolean useMuti;
private Boolean isCheck;
private boolean allowNoBatch;
private boolean allowNoExpire;
private boolean allowNoProduct;
private boolean allowNoSerial;
private String price;
private String cplx;
private String hchzsb;
//产品代理商
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;
private String remark;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getNameCode() {
return nameCode;
}
public void setNameCode(String nameCode) {
this.nameCode = nameCode;
}
public String getPackRatio() {
return packRatio;
}
public void setPackRatio(String packRatio) {
this.packRatio = packRatio;
}
public String getPackLevel() {
return packLevel;
}
public void setPackLevel(String packLevel) {
this.packLevel = packLevel;
}
public Integer getBhxjsl() {
if (bhxjsl == null || bhxjsl == 0) {
return 1;
}
return bhxjsl;
}
public void setBhxjsl(Integer bhxjsl) {
this.bhxjsl = bhxjsl;
}
public Integer getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
return 1;
}
return bhzxxsbzsl;
}
public String getSptm() {
return sptm;
}
public void setSptm(String sptm) {
this.sptm = sptm;
}
public String getManufactory() {
return manufactory;
}
public void setManufactory(String manufactory) {
this.manufactory = manufactory;
}
public String getMeasname() {
return measname;
}
public void setMeasname(String measname) {
this.measname = measname;
}
public void setBhzxxsbzsl(Integer bhzxxsbzsl) {
this.bhzxxsbzsl = bhzxxsbzsl;
}
public Integer getZxxsbzbhsydysl() {
if (zxxsbzbhsydysl == null || zxxsbzbhsydysl == 0) {
return 1;
}
return zxxsbzbhsydysl;
}
public void setZxxsbzbhsydysl(Integer zxxsbzbhsydysl) {
this.zxxsbzbhsydysl = zxxsbzbhsydysl;
}
public String getBhxjcpbm() {
return bhxjcpbm;
}
public void setBhxjcpbm(String bhxjcpbm) {
this.bhxjcpbm = bhxjcpbm;
}
public String getSjcpbm() {
return sjcpbm;
}
public void setSjcpbm(String sjcpbm) {
this.sjcpbm = sjcpbm;
}
public String getBzcj() {
return bzcj;
}
public void setBzcj(String bzcj) {
this.bzcj = bzcj;
}
public String getAddType() {
return addType;
}
public void setAddType(String addType) {
this.addType = addType;
}
public String getDeviceRecordKey() {
return deviceRecordKey;
}
public void setDeviceRecordKey(String deviceRecordKey) {
this.deviceRecordKey = deviceRecordKey;
}
public String getCpmctymc() {
return cpmctymc;
}
public void setCpmctymc(String cpmctymc) {
this.cpmctymc = cpmctymc;
}
public String getCplb() {
return cplb;
}
public void setCplb(String cplb) {
this.cplb = cplb;
}
public String getFlbm() {
return flbm;
}
public void setFlbm(String flbm) {
this.flbm = flbm;
}
public String getGgxh() {
return ggxh;
}
public void setGgxh(String ggxh) {
this.ggxh = ggxh;
}
public String getQxlb() {
return qxlb;
}
public void setQxlb(String qxlb) {
this.qxlb = qxlb;
}
public String getTyshxydm() {
return tyshxydm;
}
public void setTyshxydm(String tyshxydm) {
this.tyshxydm = tyshxydm;
}
public String getYlqxzcrbarmc() {
return ylqxzcrbarmc;
}
public void setYlqxzcrbarmc(String ylqxzcrbarmc) {
this.ylqxzcrbarmc = ylqxzcrbarmc;
}
public String getZczbhhzbapzbh() {
return zczbhhzbapzbh;
}
public void setZczbhhzbapzbh(String zczbhhzbapzbh) {
this.zczbhhzbapzbh = zczbhhzbapzbh;
}
public String getYlqxzcrbarywmc() {
return ylqxzcrbarywmc;
}
public void setYlqxzcrbarywmc(String ylqxzcrbarywmc) {
this.ylqxzcrbarywmc = ylqxzcrbarywmc;
}
public String getSydycpbs() {
return sydycpbs;
}
public void setSydycpbs(String sydycpbs) {
this.sydycpbs = sydycpbs;
}
public String getUuid() {
return uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid;
}
public Integer getVersionNumber() {
return versionNumber;
}
public void setVersionNumber(Integer versionNumber) {
this.versionNumber = versionNumber;
}
public Integer getDiType() {
return diType;
}
public void setDiType(Integer diType) {
this.diType = diType;
}
public String getThirdId() {
return thirdId;
}
public void setThirdId(String thirdId) {
this.thirdId = thirdId;
}
public String getThirdName() {
return thirdName;
}
public void setThirdName(String thirdName) {
this.thirdName = thirdName;
}
public String getBatchNo() {
return batchNo;
}
public void setBatchNo(String batchNo) {
this.batchNo = batchNo;
}
public String getProduceDate() {
return produceDate;
}
public void setProduceDate(String produceDate) {
this.produceDate = produceDate;
}
public String getExpireDate() {
return expireDate;
}
public void setExpireDate(String expireDate) {
this.expireDate = expireDate;
}
public String getSerialNo() {
return serialNo;
}
public void setSerialNo(String serialNo) {
this.serialNo = serialNo;
}
public String getUdi() {
return udi;
}
public void setUdi(String udi) {
this.udi = udi;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public Integer getCount() {
if (count == null)
return 1;
return count;
}
public void setCount(Integer count) {
this.count = count;
}
public String getWarehouseCode() {
return warehouseCode;
}
public void setWarehouseCode(String warehouseCode) {
this.warehouseCode = warehouseCode;
}
public String getYbbm() {
return ybbm;
}
public void setYbbm(String ybbm) {
this.ybbm = ybbm;
}
public Boolean getCheck() {
return isCheck;
}
public void setCheck(Boolean check) {
isCheck = check;
}
public Integer getProductType() {
return productType;
}
public void setProductType(Integer productType) {
this.productType = productType;
}
public static UdiInfoResponse initUdiInfoEntity(UdiInfoResponse udiInfoEntity) {
if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhph()) && "否".equals(udiInfoEntity.getScbssfbhph())) {
udiInfoEntity.setAllowNoBatch(true);
}
if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhscrq()) && "否".equals(udiInfoEntity.getScbssfbhscrq())) {
udiInfoEntity.setAllowNoProduct(true);
}
if (StrUtil.isNotEmpty(udiInfoEntity.getScbssfbhsxrq()) && "否".equals(udiInfoEntity.getScbssfbhsxrq())) {
udiInfoEntity.setAllowNoExpire(true);
}
return udiInfoEntity;
}
}

@ -0,0 +1,19 @@
package com.glxp.api.service.basic;
import com.glxp.api.entity.basic.BasicProductSetEntity;
import com.glxp.api.req.basic.FilterBasicProductSetrequest;
import java.util.List;
import java.util.Map;
public interface BasicProductSetService {
List<BasicProductSetEntity> filterSetup(FilterBasicProductSetrequest filterBasicProductSetrequest);
Map<String, BasicProductSetEntity> filterAllEnable();
boolean updateSetup(BasicProductSetEntity basicProductSetEntity);
}

@ -91,9 +91,6 @@ public interface UdiRelevanceService extends IService<UdiRelevanceEntity> {
*/
String findUuidById(String relId);
UdiRelevanceResponse selectUdiId(Long id);
List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode, Boolean isDisable);
/**

@ -0,0 +1,60 @@
package com.glxp.api.service.basic.impl;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.basic.BasicProductSetDao;
import com.glxp.api.entity.basic.BasicProductSetEntity;
import com.glxp.api.req.basic.FilterBasicProductSetrequest;
import com.glxp.api.service.basic.BasicProductSetService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
@Transactional(rollbackFor = Exception.class)
public class BasicProductSetServiceImpl implements BasicProductSetService {
@Resource
BasicProductSetDao basicProductSetDao;
@Override
public List<BasicProductSetEntity> filterSetup(FilterBasicProductSetrequest filterBasicProductSetrequest) {
if (filterBasicProductSetrequest == null) {
return Collections.emptyList();
}
if (filterBasicProductSetrequest.getPage() != null) {
int offset = (filterBasicProductSetrequest.getPage() - 1) * filterBasicProductSetrequest.getLimit();
PageHelper.offsetPage(offset, filterBasicProductSetrequest.getLimit());
}
return basicProductSetDao.filterSetup(filterBasicProductSetrequest);
}
@Override
public Map<String, BasicProductSetEntity> filterAllEnable() {
FilterBasicProductSetrequest filterBasicProductSetrequest = new FilterBasicProductSetrequest();
filterBasicProductSetrequest.setEnable(true);
List<BasicProductSetEntity> basicProductSetEntities = basicProductSetDao.filterSetup(filterBasicProductSetrequest);
Map<String, BasicProductSetEntity> basicProductSetEntityMap = new HashMap<>();
if (CollUtil.isNotEmpty(basicProductSetEntities)) {
for (BasicProductSetEntity basicProductSetEntity : basicProductSetEntities) {
basicProductSetEntityMap.put(basicProductSetEntity.getParmKey(), basicProductSetEntity);
}
}
return basicProductSetEntityMap;
}
@Override
public boolean updateSetup(BasicProductSetEntity basicProductSetEntity) {
return basicProductSetDao.updateSetup(basicProductSetEntity);
}
}

@ -197,16 +197,6 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
return null;
}
@Override
public UdiRelevanceResponse selectUdiId(Long id) {
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
filterUdiRelRequest.setId(id);
List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest);
if (data != null && data.size() > 0)
return data.get(0);
return null;
}
@Override
public UdiRelevanceResponse selectSupGroupById(Long id) {
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
@ -411,19 +401,4 @@ public class UdiRelevanceServiceImpl extends ServiceImpl<UdiRelevanceDao, UdiRel
return null;
}
@Override
public List<UdiRelevanceResponse> filterCertUdi(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 = udiRelevanceDao.filterCertUdi(filterUdiRelRequest);
return data;
}
}

@ -1,6 +1,7 @@
package com.glxp.api.service.system;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
import com.glxp.api.entity.system.SystemPDFModuleEntity;
import com.glxp.api.req.system.FilterPdfModuleRequest;
@ -20,6 +21,11 @@ public interface SystemPDFModuleService {
SystemPDFModuleEntity selectById(String id);
SysPdfTemplateRelevanceLabelEntity selectByLabelId(String id);
SysPdfTemplateRelevanceStatemenEntity selectByStatemenId(String id);
boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest);
boolean insert(SystemPDFModuleEntity systemPDFModuleEntity);
@ -28,5 +34,4 @@ public interface SystemPDFModuleService {
List<SystemPDFModuleEntity> findByLastTime(Date lastUpdateTime);
SysPdfTemplateRelevanceStatemenEntity selectByStatemenId(String id);
}

@ -3,6 +3,7 @@ package com.glxp.api.service.system.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.system.SystemPDFModuleDao;
import com.glxp.api.dao.system.SystemPDFTemplateRelevanceDao;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
import com.glxp.api.entity.system.SystemPDFModuleEntity;
import com.glxp.api.req.system.FilterPdfModuleRequest;
@ -44,7 +45,7 @@ public class SystemPDFModuleServiceImpl implements SystemPDFModuleService {
@Override
public SystemPDFModuleEntity findSystemPDFModule(FilterPdfModuleRequest filterPDFModuleRequest) {
return systemPDFModuleDao.findSystemPDFModule(filterPDFModuleRequest);
return systemPDFModuleDao.findSystemPDFModuleByKey(filterPDFModuleRequest);
}
@Override
@ -52,6 +53,11 @@ public class SystemPDFModuleServiceImpl implements SystemPDFModuleService {
return systemPDFModuleDao.selectById(id);
}
@Override
public SysPdfTemplateRelevanceLabelEntity selectByLabelId(String id) {
return systemPDFTemplateRelevanceDao.selectByLabelId(id);
}
@Override
public boolean updateById(SysPdfModuleSaveRequest sysPdfModuleSaveRequest) {

@ -0,0 +1,41 @@
package com.glxp.api.service.thrsys;
import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity;
import com.glxp.api.req.thrsys.AddThrDiProductsRequest;
import com.glxp.api.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.res.thrsys.ThrProductsAddDiResponse;
import com.glxp.api.res.thrsys.UdiInfoResponse;
import java.util.List;
public interface ThrProductsAddDiService {
List<ThrProductsAddDiResponse> filterThrProductsList(FilterThrProductsRequest filterThrProductsRequest);
ThrProductsAddDiResponse selecById(Long id);
ThrProductsAddDiResponse selecByUuid(String uuid);
/**
* DI
*
* @param id
*/
boolean delThrDiProducts(Long id);
boolean updateDiProduct(ThrProductsAddDiEntity thrProductsAddDiEntity);
boolean addThrAddDiProducts(AddThrDiProductsRequest thrDiProductsRequest);
UdiInfoResponse getDiProductDetail(String uuid);
/** 根据ID查询 */
ThrProductsAddDiEntity filterThrProductsGetId( Integer id);
boolean insertThrProducts(ThrProductsAddDiEntity thrProductsAddDiEntity);
List<ThrProductsAddDiResponse> filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest);
List<ThrProductsAddDiEntity> filterThrProductsDiLists(FilterThrProductsRequest filterThrProductsRequest);
}

@ -37,6 +37,7 @@ public interface ThrProductsService {
boolean insertThrProducts(ThrProductsEntity thrProductsEntity);
Boolean isExit(String code, String thirdIdFk);
List<ThrProductsEntity> findByLastTime(Date lastUpdateTime);

@ -0,0 +1,175 @@
package com.glxp.api.service.thrsys.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.thrsys.ThrProductsAddDiDao;
import com.glxp.api.entity.basic.ProductInfoEntity;
import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity;
import com.glxp.api.req.thrsys.AddThrDiProductsRequest;
import com.glxp.api.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.res.thrsys.ThrProductsAddDiResponse;
import com.glxp.api.res.thrsys.UdiInfoResponse;
import com.glxp.api.service.basic.ProductInfoService;
import com.glxp.api.service.thrsys.ThrProductsAddDiService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService {
@Resource
private ThrProductsAddDiDao thrProductsAddDiDao;
@Resource
private ProductInfoService productInfoService;
@Override
public List<ThrProductsAddDiResponse> filterThrProductsList(FilterThrProductsRequest filterThrProductsRequest) {
if (null != filterThrProductsRequest && filterThrProductsRequest.getPage() != null) {
int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit();
PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
}
List<ThrProductsAddDiResponse> thrProductsAddDiResponses = thrProductsAddDiDao.filterThrProductsList(filterThrProductsRequest);
if (CollUtil.isNotEmpty(thrProductsAddDiResponses)) {
thrProductsAddDiResponses.forEach(thrProductsAddDiResponse -> {
thrProductsAddDiResponse.setStandard(thrProductsAddDiResponse.getSpec());
thrProductsAddDiResponse.setZczbhhzbapzbh(thrProductsAddDiResponse.getRegisterNo());
});
}
return thrProductsAddDiResponses;
}
@Override
public ThrProductsAddDiResponse selecById(Long id) {
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
filterThrProductsRequest.setId(id);
List<ThrProductsAddDiResponse> thrProductsAddDiResponses = thrProductsAddDiDao.filterThrProductsList(filterThrProductsRequest);
if (CollUtil.isNotEmpty(thrProductsAddDiResponses)) {
return thrProductsAddDiResponses.get(0);
}
return null;
}
@Override
public ThrProductsAddDiResponse selecByUuid(String uuid) {
if (StrUtil.isEmpty(uuid)) {
return null;
}
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
filterThrProductsRequest.setUuid(uuid);
List<ThrProductsAddDiResponse> thrProductsAddDiResponses = thrProductsAddDiDao.filterThrProductsList(filterThrProductsRequest);
if (CollUtil.isNotEmpty(thrProductsAddDiResponses)) {
return thrProductsAddDiResponses.get(0);
}
return null;
}
@Override
public boolean delThrDiProducts(Long id) {
return thrProductsAddDiDao.deleteById(id);
}
@Override
public boolean updateDiProduct(ThrProductsAddDiEntity thrProductsAddDiEntity) {
return thrProductsAddDiDao.updateDiProduct(thrProductsAddDiEntity);
}
@Override
public boolean addThrAddDiProducts(AddThrDiProductsRequest thrDiProductsRequest) {
List<String> uuids = thrDiProductsRequest.getUuids();
Long customerId = thrDiProductsRequest.getCustomerId();
List<ThrProductsAddDiEntity> list = new ArrayList<>(uuids.size());
Date date = new Date();
for (String uuid : uuids) {
ProductInfoEntity productInfoEntity = productInfoService.selectByUuid(uuid).get(0);
ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity();
BeanUtils.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity);
thrProductsAddDiEntity.setCustomerId(customerId + "");
thrProductsAddDiEntity.setUuid(uuid);
thrProductsAddDiEntity.setType(1);
thrProductsAddDiEntity.setYlqxzcrbarywmc(productInfoEntity.getYlqxzcrbarywmc());
thrProductsAddDiEntity.setCplb(productInfoEntity.getCplb());
thrProductsAddDiEntity.setCpms(productInfoEntity.getCpms());
thrProductsAddDiEntity.setFlbm(productInfoEntity.getFlbm());
thrProductsAddDiEntity.setQxlb(productInfoEntity.getQxlb());
thrProductsAddDiEntity.setTyshxydm(productInfoEntity.getTyshxydm());
thrProductsAddDiEntity.setCode(productInfoEntity.getNameCode());
thrProductsAddDiEntity.setName(productInfoEntity.getCpmctymc());
thrProductsAddDiEntity.setStandard(productInfoEntity.getGgxh());
thrProductsAddDiEntity.setSpec(productInfoEntity.getGgxh());
thrProductsAddDiEntity.setRegisterNo(productInfoEntity.getZczbhhzbapzbh());
thrProductsAddDiEntity.setYlqxzcrbarmc(productInfoEntity.getYlqxzcrbarmc());
thrProductsAddDiEntity.setZczbhhzbapzbh(productInfoEntity.getZczbhhzbapzbh());
//设置编辑区参数
thrProductsAddDiEntity.setSptm(thrDiProductsRequest.getSptm());
thrProductsAddDiEntity.setYbbm(thrDiProductsRequest.getYbbm());
thrProductsAddDiEntity.setMeasname(thrDiProductsRequest.getMeasname());
thrProductsAddDiEntity.setManufactory(thrDiProductsRequest.getManufactory());
thrProductsAddDiEntity.setSpmc(thrDiProductsRequest.getSpmc());
thrProductsAddDiEntity.setCpms(thrDiProductsRequest.getCpms());
thrProductsAddDiEntity.setPrice(thrDiProductsRequest.getPrice());
thrProductsAddDiEntity.setCreateTime(date);
thrProductsAddDiEntity.setUpdateTime(new Date());
thrProductsAddDiEntity.setStatus(1); //未审核
thrProductsAddDiEntity.setSelectThridSysStr(JSONUtil.toJsonStr(thrDiProductsRequest.getSelectThirdSys()));
list.add(thrProductsAddDiEntity);
}
return thrProductsAddDiDao.insertThrDiProducts(list);
}
@Override
public UdiInfoResponse getDiProductDetail(String uuid) {
ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiDao.filterThrProductsGetUuid(uuid);
UdiInfoResponse udiInfoResponse = thrProductsAddDiDao.getDiProductDetail(uuid);
if(udiInfoResponse!=null){
udiInfoResponse.setSptm(thrProductsAddDiEntity.getSptm());
udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm());
udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
udiInfoResponse.setCpms(thrProductsAddDiEntity.getCpms());
udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname());
udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory());
udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice());
udiInfoResponse.setBasicPrductRemak1(thrProductsAddDiEntity.getBasicPrductRemak1());
udiInfoResponse.setBasicPrductRemak2(thrProductsAddDiEntity.getBasicPrductRemak2());
udiInfoResponse.setBasicPrductRemak3(thrProductsAddDiEntity.getBasicPrductRemak3());
udiInfoResponse.setBasicPrductRemak4(thrProductsAddDiEntity.getBasicPrductRemak4());
udiInfoResponse.setBasicPrductRemak5(thrProductsAddDiEntity.getBasicPrductRemak5());
udiInfoResponse.setBasicPrductRemak6(thrProductsAddDiEntity.getBasicPrductRemak6());
udiInfoResponse.setBasicPrductRemak7(thrProductsAddDiEntity.getBasicPrductRemak7());
udiInfoResponse.setBasicPrductRemak8(thrProductsAddDiEntity.getBasicPrductRemak8());
}
return udiInfoResponse;
}
@Override
public ThrProductsAddDiEntity filterThrProductsGetId(Integer id) {
return thrProductsAddDiDao.filterThrProductsGetId(id);
}
@Override
public boolean insertThrProducts(ThrProductsAddDiEntity thrProductsAddDiEntity) {
return thrProductsAddDiDao.insert(thrProductsAddDiEntity);
}
@Override
public List<ThrProductsAddDiResponse> filterThrProductsDiList(FilterThrProductsRequest filterThrProductsRequest) {
return thrProductsAddDiDao.filterThrProductsDiList(filterThrProductsRequest);
}
@Override
public List<ThrProductsAddDiEntity> filterThrProductsDiLists(FilterThrProductsRequest filterThrProductsRequest) {
return thrProductsAddDiDao.filterThrProductsDiLists(filterThrProductsRequest);
}
}

@ -116,6 +116,11 @@ public class ThrProductsServiceImpl implements ThrProductsService {
return thrProductsDao.insertThrProducts(thrProductsEntity);
}
@Override
public Boolean isExit(String code, String thirdIdFk) {
return null;
}
@Override
public List<ThrProductsEntity> findByLastTime(Date lastUpdateTime) {
return thrProductsDao.selectByLastTime(lastUpdateTime);

@ -20,8 +20,8 @@ import javax.annotation.Resource;
import java.util.Arrays;
@Component
@EnableScheduling
//@Component
//@EnableScheduling
public class SyncHeartTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(SyncHeartTask.class);

@ -12,8 +12,8 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.lang.reflect.Method;
import java.util.concurrent.Executor;
@EnableAsync
@Configuration
//@EnableAsync
//@Configuration
@ConditionalOnProperty(prefix = "spring.sgrain.async-thread-pool", name = "enable", havingValue = "true", matchIfMissing = false)
public class TaskExecutorConfig implements AsyncConfigurer {

@ -0,0 +1,175 @@
package com.glxp.api.util;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.entity.basic.BasicProductSetEntity;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.req.basic.SupplementRequest;
import com.glxp.api.service.basic.BasicProductSetService;
import com.glxp.api.service.system.SystemParamConfigService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Map;
@Service
public class SupplementVailUtil {
@Resource
BasicProductSetService basicProductSetService;
@Resource
SystemParamConfigService systemParamConfigService;
public static final int SUP_SELECT = 1;
public static final int SUP_ADD = 2;
public static final int LOCAL_ADD = 3;
public static final int LOCAL_EIDT = 4;
public String vail(SupplementRequest supplementRequest, int type) {
//验证产品信息是否必填
Map<String, BasicProductSetEntity> basicProductSetEntityMap = basicProductSetService.filterAllEnable();
Map<String, SystemParamConfigEntity> systemParamConfigEntityMap = systemParamConfigService.findBasicAll();
if (basicProductSetEntityMap.size() > 0) {
BasicProductSetEntity basicProductSetEntity = null;
basicProductSetEntity = basicProductSetEntityMap.get("sptm");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmpty(supplementRequest.getSptm())) {
return "商品条码不能为空";
}
}
basicProductSetEntity = basicProductSetEntityMap.get("ybbm");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmpty(supplementRequest.getYbbm())) {
return "医保编码不能为空";
}
}
basicProductSetEntity = basicProductSetEntityMap.get("measname");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmptyIfStr(supplementRequest.getMeasname())) {
return "计量单位不能为空";
}
}
basicProductSetEntity = basicProductSetEntityMap.get("manufactory");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmptyIfStr(supplementRequest.getManufactory())) {
return "生产厂家不能为空";
}
}
basicProductSetEntity = basicProductSetEntityMap.get("spmc");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmptyIfStr(supplementRequest.getSpmc())) {
return "商品名称不能为空";
}
}
basicProductSetEntity = basicProductSetEntityMap.get("cpms");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmptyIfStr(supplementRequest.getCpms())) {
return "产品描述不能为空";
}
}
basicProductSetEntity = basicProductSetEntityMap.get("price");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmptyIfStr(supplementRequest.getPrice())) {
return "产品价格不能为空";
}
}
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak1");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak1())) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak1");
if (!systemParamConfigEntity.getParamValue().equals("0")) {
return systemParamConfigEntity.getParamValue() + "不能为空";
}
}
}
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak2");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak2())) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak2");
if (!systemParamConfigEntity.getParamValue().equals("0")) {
return systemParamConfigEntity.getParamValue() + "不能为空";
}
}
}
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak3");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak3())) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak3");
if (!systemParamConfigEntity.getParamValue().equals("0")) {
return systemParamConfigEntity.getParamValue() + "不能为空";
}
}
}
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak4");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak4())) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak4");
if (!systemParamConfigEntity.getParamValue().equals("0")) {
return systemParamConfigEntity.getParamValue() + "不能为空";
}
}
}
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak5");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak5())) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak5");
if (!systemParamConfigEntity.getParamValue().equals("0")) {
return systemParamConfigEntity.getParamValue() + "不能为空";
}
}
}
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak6");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak6())) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak6");
if (!systemParamConfigEntity.getParamValue().equals("0")) {
return systemParamConfigEntity.getParamValue() + "不能为空";
}
}
}
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak7");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak7())) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak7");
if (!systemParamConfigEntity.getParamValue().equals("0")) {
return systemParamConfigEntity.getParamValue() + "不能为空";
}
}
}
basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak8");
if (isMustFill(type, basicProductSetEntity)) {
if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak8())) {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntityMap.get("basicPrductRemak8");
if (!systemParamConfigEntity.getParamValue().equals("0")) {
return systemParamConfigEntity.getParamValue() + "不能为空";
}
}
}
}
return null;
}
public boolean isMustFill(int type, BasicProductSetEntity basicProductSetEntity) {
if (basicProductSetEntity == null)
return false;
if (type == SUP_SELECT && basicProductSetEntity.isSupSelect()) {
return true;
} else if (type == SUP_ADD && basicProductSetEntity.isSupAdd()) {
return true;
} else if (type == LOCAL_ADD && basicProductSetEntity.isLocalAdd()) {
return true;
} else if (type == LOCAL_EIDT && basicProductSetEntity.isLocalEdit()) {
return true;
}
return false;
}
}

@ -0,0 +1,42 @@
<?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.BasicProductSetDao">
<select id="filterSetup"
parameterType="com.glxp.api.req.basic.FilterBasicProductSetrequest"
resultType="com.glxp.api.entity.basic.BasicProductSetEntity">
SELECT *
FROM basic_product_set
<where>
<if test="parmName != '' and parmName!=null">
and udiRlIdFk = #{udiRlIdFk}
</if>
<if test="enable != null ">
and enable = #{enable}
</if>
</where>
ORDER BY sort
</select>
<insert id="updateSetup" parameterType="com.glxp.api.entity.basic.BasicProductSetEntity">
replace
INTO basic_product_set(parmName,
parmKey,enable,supSelect,supAdd,localAdd,remark,sort,localEdit) values
(
#{parmName},
#{parmKey},
#{enable} ,
#{supSelect},
#{supAdd},
#{localAdd},
#{remark},
#{sort},
#{localEdit}
)
</insert>
</mapper>

@ -128,6 +128,7 @@
<if test="originUuid != '' and originUuid != null">
AND originUuid = #{originUuid}
</if>
</where>
ORDER BY updateTime DESC
</select>

@ -420,7 +420,6 @@
ORDER BY modifyTime DESC
</select>
<!-- 资质证书选入产品分组查询-->
<select id="filterCertUdi" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
@ -585,6 +584,8 @@
<if test="tyshxydm != '' and tyshxydm != null">
AND basic_products.tyshxydm = #{tyshxydm}
</if>
</where>
GROUP BY cpmctymc, manufactory
</select>
@ -1103,7 +1104,7 @@
<select id="selectRemindParams" resultType="com.glxp.api.entity.basic.UdiRelevanceEntity">
select id, lowStockNum, overStockNum, recentDateTime
select lowStockNum, overStockNum, recentDateTime
from basic_udirel
where id = #{relId}
</select>
@ -1248,174 +1249,5 @@
</where>
limit 1
</select>
<!-- 资质证书选入产品分组查询-->
<select id="filterCertUdi" parameterType="com.glxp.api.req.basic.FilterUdiRelRequest"
resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
select basic_udirel.*,
bht.name classifyName,
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.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
FROM basic_products
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
left join basic_hosp_type bht on basic_udirel.relCode = bht.code
inner join company_product_relevance on company_product_relevance.udiRlIdFk = basic_udirel.id
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
</if>
<if test="manufactory != '' and manufactory != null">
AND manufactory LIKE concat('%', #{manufactory}, '%')
</if>
<if test="relCode != '' and relCode != null">
AND relCode = #{relCode}
</if>
<if test="bindType != '' and bindType != null">
AND relCode is null
or trim(relCode) = ''
</if>
<if test="supName != '' and supName != null">
AND supName LIKE concat('%', #{supName}, '%')
</if>
<if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode}, '%')
</if>
<if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
</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 ybbm LIKE concat('%', #{unionCode}, '%')
or sptm LIKE concat('%', #{unionCode}, '%'))
</if>
<if test="isDisable == false">
AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
</if>
<if test="thrPiId != '' and thrPiId != null">
and (thirdId LIKE concat('%', #{thrPiId}, '%')
or thirdId1 LIKE concat('%', #{thrPiId}, '%')
or thirdId2 LIKE concat('%', #{thrPiId}, '%')
or thirdId3 LIKE concat('%', #{thrPiId}, '%')
or thirdId4 LIKE concat('%', #{thrPiId}, '%'))
</if>
<if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid}
</if>
<if test="thirdId != '' and thirdId != null">
AND thirdId = #{thirdId}
</if>
<if test="udplatCode != '' and udplatCode != null">
AND udplatCode = #{udplatCode}
</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 (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
thirdId3 <![CDATA[<>]]> '' or 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 (mainId is NULL or mainId = '')
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 4">
AND thirdId1 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 5">
AND thirdId2 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 6">
AND thirdId3 is NULL
and basic_products.originUuid <![CDATA[<>]]> ''
</if>
<if test="filterType != null and filterType == 7">
AND 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="lockStatus != '' and lockStatus != null">
AND basic_udirel.lockStatus = #{lockStatus}
</if>
<if test="mainId != '' and mainId != null">
AND mainId = #{mainId}
</if>
<if test="id != '' and id != null">
AND basic_udirel.id = #{id}
</if>
<if test="customerId != '' and customerId != null">
AND company_product_relevance.unitFk = #{customerId}
</if>
<if test="tyshxydm != '' and tyshxydm != null">
AND basic_products.tyshxydm = #{tyshxydm}
</if>
</where>
GROUP BY cpmctymc, manufactory
</select>
</mapper>

@ -61,6 +61,19 @@
</if>
</foreach>
</insert>
<select id="selectByLabelId" parameterType="java.lang.String"
resultType="com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity">
select *
FROM sys_pdf_template_relevance_label
WHERE id = #{id}
</select>
<select id="selectByStatemenId" parameterType="java.lang.String"
resultType="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity">
select *
FROM sys_pdf_template_relevance_statemen
WHERE id = #{id}
</select>
<insert id="insert" parameterType="com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity">
insert
@ -129,10 +142,17 @@
</where>
</select>
<select id="selectByStatemenId" parameterType="java.lang.String"
resultType="com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity">
select *
FROM sys_pdf_template_relevance_statemen
WHERE id = #{id}
<select id="selectNameAndAction" resultType="com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity">
SELECT *
FROM sys_pdf_template_relevance_code
<where>
<if test="name != null">
AND `name` = #{name}
</if>
<if test="localAction != null">
AND `localAction` = #{localAction}
</if>
</where>
</select>
</mapper>

@ -0,0 +1,270 @@
<?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.thrsys.ThrProductsAddDiDao">
<insert id="insertThrDiProducts" keyProperty="id" parameterType="java.util.List">
insert into thr_products_add_di (uuid, customerId, createTime,
auditTime, remark, auditUser,
`status`, thirdSysFk, code,
sptm, ybbm, measname,
manufactory, spmc, cpms,
price, selectThridSysStr, basicPrductRemak1,
basicPrductRemak2, basicPrductRemak3, basicPrductRemak4,
basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
basicPrductRemak8, `name`, spec,
registerNo, cplb, flbm,
qxlb, tyshxydm, zczbhhzbapzbh,
ylqxzcrbarmc, ylqxzcrbarywmc, updateTime,
supName, model, `standard`,
qtbm, zczyxqz, relId, type)
values
<foreach collection="list" index="index" item="item" separator=",">
(#{item.uuid},
#{item.customerId},
#{item.createTime},
#{item.auditTime},
#{item.remark},
#{item.auditUser},
#{item.status},
#{item.thirdSysFk},
#{item.code},
#{item.sptm},
#{item.ybbm},
#{item.measname},
#{item.manufactory},
#{item.spmc},
#{item.cpms}, #{item.price}, #{item.selectThridSysStr}
, #{item.basicPrductRemak1}, #{item.basicPrductRemak2}, #{item.basicPrductRemak3},
#{item.basicPrductRemak4}
, #{item.basicPrductRemak5}, #{item.basicPrductRemak6}, #{item.basicPrductRemak7},
#{item.basicPrductRemak8}
, #{item.name}, #{item.spec}, #{item.registerNo}, #{item.cplb}
, #{item.flbm}, #{item.qxlb}, #{item.tyshxydm}, #{item.zczbhhzbapzbh}
, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.updateTime}, #{item.supName}, #{item.model}
, #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type})
</foreach>
</insert>
<update id="updateDiProduct" parameterType="com.glxp.api.entity.thrsys.ThrProductsAddDiEntity">
update thr_products_add_di
<trim prefix="set" suffixOverrides=",">
<if test="uuid != null">
uuid=#{uuid},
</if>
<if test="customerId != null">
customerId=#{customerId},
</if>
<if test="createTime != null">
createTime=#{createTime},
</if>
<if test="auditTime != null">
auditTime=#{auditTime},
</if>
<if test="remark != null">
remark=#{remark},
</if>
<if test="auditUser != null">
auditUser=#{auditUser},
</if>
<if test="thirdSysFk != null">
`thirdSysFk`=#{thirdSysFk},
</if>
<if test="code != null">
`code`=#{code},
</if>
<if test="sptm != null">
`sptm`=#{sptm},
</if>
<if test="ybbm != null">
`ybbm`=#{ybbm},
</if>
<if test="measname != null">
`measname`=#{measname},
</if>
<if test="manufactory != null">
`manufactory`=#{manufactory},
</if>
<if test="spmc != null">
`spmc`=#{spmc},
</if>
<if test="cpms != null">
`cpms`=#{cpms},
</if>
<if test="status != null">
`status`=#{status},
</if>
<if test="price != null">
`price`=#{price},
</if>
<if test="basicPrductRemak1 != null">
`basicPrductRemak1`=#{basicPrductRemak1},
</if>
<if test="basicPrductRemak2 != null">
`basicPrductRemak2`=#{basicPrductRemak2},
</if>
<if test="basicPrductRemak3 != null">
`basicPrductRemak3`=#{basicPrductRemak3},
</if>
<if test="basicPrductRemak4 != null">
`basicPrductRemak4`=#{basicPrductRemak4},
</if>
<if test="basicPrductRemak5 != null">
`basicPrductRemak5`=#{basicPrductRemak5},
</if>
<if test="basicPrductRemak6 != null">
`basicPrductRemak6`=#{basicPrductRemak6},
</if>
<if test="basicPrductRemak7 != null">
`basicPrductRemak7`=#{basicPrductRemak7},
</if>
<if test="basicPrductRemak8 != null">
`basicPrductRemak8`=#{basicPrductRemak8},
</if>
<if test="selectThridSysStr != null">
`selectThridSysStr`=#{selectThridSysStr},
</if>
</trim>
WHERE id = #{id}
</update>
<delete id="deleteById">
delete
from thr_products_add_di
where id = #{id}
</delete>
<select id="filterThrProductsGetId" parameterType="integer"
resultType="com.glxp.api.entity.thrsys.ThrProductsAddDiEntity">
select *
from thr_products_add_di
where id = #{id}
</select>
<select id="filterThrProductsGetUuid" parameterType="string"
resultType="com.glxp.api.entity.thrsys.ThrProductsAddDiEntity">
select *
from thr_products_add_di
where uuid = #{uuid}
</select>
<select id="filterThrProductsList" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
resultType="com.glxp.api.res.thrsys.ThrProductsAddDiResponse">
SELECT tdi.*,
bc.name companyName
FROM thr_products_add_di tdi
left join basic_corp bc on tdi.customerId = bc.erpId
<where>
<if test="checkStatus != null">
AND tdi.status = #{checkStatus}
</if>
<if test="id != null">
AND tdi.id = #{id}
</if>
<if test="customerId != null">
AND tdi.customerId = #{customerId}
</if>
<if test="code != '' and code != null">
AND (tdi.sptm = #{code} OR code = #{code} OR tdi.ybbm = #{code})
</if>
<if test="uuid != '' and uuid != null">
AND tdi.uuid = #{uuid}
</if>
<if test="name != '' and name != null">
AND tdi.name = #{name}
</if>
<if test="spec != '' and spec != null">
AND tdi.spec = #{spec}
</if>
<if test="checkStatus != null">
AND tdi.status = #{checkStatus}
</if>
<if test="customerId != '' and customerId != null">
AND tdi.customerId = #{customerId}
</if>
<if test="registerNo != '' and registerNo != null">
AND tdi.registerNo = #{registerNo}
</if>
</where>
order by tdi.createTime DESC
</select>
<select id="getDiProductDetail" resultType="com.glxp.api.res.thrsys.UdiInfoResponse">
select *
from productinfo
where uuid = #{uuid}
limit 1
</select>
<insert id="insert" keyColumn="id" keyProperty="id"
parameterType="com.glxp.api.entity.thrsys.ThrProductsAddDiEntity" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into thr_products_add_di (uuid, customerId, createTime,
auditTime, remark, auditUser,
`status`, thirdSysFk, code,
sptm, ybbm, measname,
manufactory, spmc, cpms,
price, selectThridSysStr, basicPrductRemak1,
basicPrductRemak2, basicPrductRemak3, basicPrductRemak4,
basicPrductRemak5, basicPrductRemak6, basicPrductRemak7,
basicPrductRemak8, `name`, spec,
registerNo, cplb, flbm,
qxlb, tyshxydm, zczbhhzbapzbh,
ylqxzcrbarmc, ylqxzcrbarywmc, updateTime,
supName, model, `standard`,
qtbm, zczyxqz, relId, type)
values (#{uuid,jdbcType=VARCHAR}, #{customerId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},
#{auditTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, #{auditUser,jdbcType=VARCHAR},
#{status,jdbcType=INTEGER}, #{thirdSysFk,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR},
#{sptm,jdbcType=VARCHAR}, #{ybbm,jdbcType=VARCHAR}, #{measname,jdbcType=VARCHAR},
#{manufactory,jdbcType=VARCHAR}, #{spmc,jdbcType=VARCHAR}, #{cpms,jdbcType=VARCHAR},
#{price,jdbcType=VARCHAR}, #{selectThridSysStr,jdbcType=VARCHAR}, #{basicPrductRemak1,jdbcType=VARCHAR},
#{basicPrductRemak2,jdbcType=VARCHAR}, #{basicPrductRemak3,jdbcType=VARCHAR},
#{basicPrductRemak4,jdbcType=VARCHAR},
#{basicPrductRemak5,jdbcType=VARCHAR}, #{basicPrductRemak6,jdbcType=VARCHAR},
#{basicPrductRemak7,jdbcType=VARCHAR},
#{basicPrductRemak8,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{spec,jdbcType=VARCHAR},
#{registerNo,jdbcType=VARCHAR}, #{cplb,jdbcType=VARCHAR}, #{flbm,jdbcType=VARCHAR},
#{qxlb,jdbcType=VARCHAR}, #{tyshxydm,jdbcType=VARCHAR}, #{zczbhhzbapzbh,jdbcType=VARCHAR},
#{ylqxzcrbarmc,jdbcType=VARCHAR}, #{ylqxzcrbarywmc,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
#{supName,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR},
#{qtbm,jdbcType=VARCHAR}, #{zczyxqz,jdbcType=VARCHAR}, #{relId,jdbcType=VARCHAR},
#{type,jdbcType=VARCHAR})
</insert>
<select id="filterThrProductsDiList" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
resultType="com.glxp.api.res.thrsys.ThrProductsAddDiResponse">
SELECT tdi.*
FROM thr_products_add_di tdi
<where>
<if test="thirdSysFk != null">
AND tdi.thirdSysFk = #{thirdSysFk}
</if>
<if test="code != null">
AND tdi.code = #{code}
</if>
<if test="status != null">
AND tdi.status = #{status}
</if>
</where>
</select><select id="filterThrProductsDiLists" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
resultType="com.glxp.api.entity.thrsys.ThrProductsAddDiEntity">
SELECT tdi.*
FROM thr_products_add_di tdi
<where>
<if test="thirdSysFk != null">
AND tdi.thirdSysFk = #{thirdSysFk}
</if>
<if test="code != null">
AND tdi.code = #{code}
</if>
<if test="status != null">
AND tdi.status = #{status}
</if>
<if test="diType != null">
AND updateTime &lt;= "2023-04-5 00:00:00"
</if>
</where>
</select>
</mapper>
Loading…
Cancel
Save