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

代码备份

Browse Source
dev_no_inv
yewj 10 months ago
parent f1601e673f
commit 5b42e35df6
4 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File

6
src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java
Unescape Escape View File

@ -118,9 +118,9 @@ public class BasicSkPrescribeController extends BaseController {
@PostMapping("/udiwms/basic/sk/prescribe/save")
public BaseResponse sickerPrescribeSave(@RequestBody SickerPrescribeSaveRequest sickerPrescribeSaveRequest) {
Integer stauts = sickerPrescribeSaveRequest.getStauts();
if (stauts == 1){
if (stauts == 1) {
List<IoCollectOrder> list = sickerPrescribeSaveRequest.getList();
if (CollUtil.isNotEmpty(list)){
if (CollUtil.isNotEmpty(list)) {
CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
for (IoCollectOrder ioCollectOrder : list) {
collectOrderRequest.setBillNo(ioCollectOrder.getBillNo());
@ -128,7 +128,7 @@ public class BasicSkPrescribeController extends BaseController {
return downloadFactory.downloadOrder(collectOrderRequest);
}
}
}else if (stauts == 2){
} else if (stauts == 2) {
CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
collectOrderRequest.setStartTime(sickerPrescribeSaveRequest.getStartTime());
collectOrderRequest.setEndTime(sickerPrescribeSaveRequest.getEndTime());

39
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -166,7 +166,7 @@ public class IoCodeTempController extends BaseController {
collectOrder.setWorkPlaceCode(addEnterCodeRequest.getWorkPlaceCode());
collectOrder.setBusType(addEnterCodeRequest.getBusType());
IoCollectOrder ioCollectOrder = new IoCollectOrder();
BeanUtils.copyProperties(collectOrder,ioCollectOrder);
BeanUtils.copyProperties(collectOrder, ioCollectOrder);
collectOrderService.updateById(ioCollectOrder);
BaseResponse response = ResultVOUtils.error(601, code);
@ -272,20 +272,20 @@ public class IoCodeTempController extends BaseController {
// TODO: 2024/9/13 首次无单进入的时候报错提示，不需要执行校验
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
if (udiEntity == null) {
String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI);
if (sptmtodi.equals("1")) {
if (code.length() == 13) {
UdiProductEntity udiProductEntity = udiProductService.findBySptm(code);
if (udiProductEntity != null) {
BaseResponse baseResponse = ResultVOUtils.error(508, "UDI码格式错误");
baseResponse.setData(udiProductEntity);
return baseResponse;
}
String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI);
if (sptmtodi.equals("1")) {
if (code.length() == 13) {
UdiProductEntity udiProductEntity = udiProductService.findBySptm(code);
if (udiProductEntity != null) {
BaseResponse baseResponse = ResultVOUtils.error(508, "UDI码格式错误");
baseResponse.setData(udiProductEntity);
return baseResponse;
}
}
BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误");
baseResponse.setData(originCode);
return baseResponse;
}
BaseResponse baseResponse = ResultVOUtils.error(501, "UDI码格式错误");
baseResponse.setData(originCode);
return baseResponse;
}
if (IntUtil.value(udiEntity.getProductType()) == 2) {
//药品
@ -404,18 +404,20 @@ public class IoCodeTempController extends BaseController {
return ResultVOUtils.error(500, "追溯码不能为空");
List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
for (String code : codeList) {
VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
AddOrderRequest addOrderRequest = new AddOrderRequest();
BeanUtils.copyProperties(addOrderCodeRequest, addOrderRequest);
if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.DATA_ERROR);
code = code.trim();
if (code.endsWith("\u001D")) {
code = code.replace("\u001D", "");
}
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
if (udiEntity == null)
return ResultVOUtils.error(500, "无效条码！");
if (udiEntity == null) {
vailCodeResultResponse.setCode(code);
vailCodeResultResponse.setStatus(2);
vailCodeResultResponse.setErrMsg("无效条码");
}
if (StrUtil.isNotEmpty(addOrderRequest.getBatchNo())) {
udiEntity.setBatchNo(addOrderRequest.getBatchNo());
}
@ -439,12 +441,13 @@ public class IoCodeTempController extends BaseController {
addOrderRequest.setFromCorp(ConstantType.SPLIT_CORP);
BaseResponse baseResponse = null;
addOrderRequest.setCode(code);
if (IntUtil.value(udiEntity.getProductType()) == 2) {
baseResponse = adddGrugOrder(addOrderRequest, udiEntity, code);
} else {
baseResponse = addMaterOrder(addOrderRequest, udiEntity, code);
}
VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
if (baseResponse.getCode() == 20000) {
vailCodeResultResponse.setCode(code);
vailCodeResultResponse.setStatus(1);

11
src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
Unescape Escape View File

@ -123,6 +123,11 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
if (CollUtil.isEmpty(udiRelevanceResponses)) throw new JsonException(500, "耗材字典不存在此产品！");
else udiRelevanceResponse = udiRelevanceResponses.get(0);
IoCollectOrderCodeMan exitCode = this.findByCode(addTagCodeReqeust.getBillNo(), code);
if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && exitCode != null) {
throw new JsonException(500, "重复扫码！");
}
List<IoCollectOrderBiz> collectOrderBizs = collectOrderBizService.listByBillNo(addTagCodeReqeust.getBillNo());
//2.校验是否处方单UDI码
if (IntUtil.value(sysWorkplaceDocumentEntity.getScanType()) == WorkOperType.TYPE_GEN_ORDER) {
@ -231,7 +236,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
throw new JsonException(502, collectOrderBiz.getCpmctymc() + "拆零数量还有剩余，是否继续扫码？");
}
}
throw new JsonException(502, collectOrderBiz.getCpmctymc() +"扫码数量超出，是否继续添加！");
throw new JsonException(502, collectOrderBiz.getCpmctymc() + "扫码数量超出，是否继续添加！");
}
collectOrderBiz.setScanCount(count1);
collectOrderBiz.setScanActCount(actCount1);
@ -340,13 +345,11 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
}
collectOrderBizService.saveOrUpdate(collectOrderBiz);
IoCollectOrderCodeMan exitCode = this.findByCode(collectOrderBiz.getOrderIdFk(), code);
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && exitCode != null) {
exitCode.setScanCount(IntUtil.value(exitCode.getScanCount()) + 1);
exitCode.setBizIdFk(collectOrderBiz.getId());
this.updateById(exitCode);
} else if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && exitCode != null) {
throw new JsonException(500, "重复扫码！");
} else {
IoCollectOrderCodeMan collectOrderCodeMan =
IoCollectOrderCodeMan.builder()

3
src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java
Unescape Escape View File

@ -117,7 +117,8 @@ public class ThrOrderDownload implements IDownload {
}
if (StrUtil.isNotBlank(errorMsg)) {
ioCollectOrder.setTagStatus(4);
}
} else
ioCollectOrder.setTagStatus(2);
ioCollectOrder.setErrorMsg(errorMsg.toString());
ioCollectOrder.setBizList(bizList);
ioCollectOrderList.add(ioCollectOrder);

Write Preview
Loading…
Cancel
Save