diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java index ea65f9d2a..3916cd336 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -130,7 +130,7 @@ public class SysWorkplaceController extends BaseController { BasicCollectUserRequest basicCollectUserRequest = new BasicCollectUserRequest(); basicCollectUserRequest.setWorkplaceCode(sysWorkplace.getOrderId()); List userWorkResponses = basicCollectUserService.filterList(basicCollectUserRequest); - if (userWorkResponses.size() >0){ + if (userWorkResponses.size() > 0) { return ResultVOUtils.error("当前工位已有员工绑定,请解绑之后在删除"); } boolean save = sysWorkplaceService.removeById(sysWorkplace); diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java index 97f62b4a4..790b06af4 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderCodeManController.java @@ -17,6 +17,7 @@ import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.IoCollectOrderCodeMan; import com.glxp.api.req.collect.CollectOrderCodeManRequest; import com.glxp.api.req.inout.AddTagCodeReqeust; +import com.glxp.api.req.inout.DeleteTageCodeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.collect.CollectOrderCodeManResponse; @@ -56,14 +57,14 @@ public class IoCollectOrderCodeManController extends BaseController { @Resource IoCollectOrderBizService collectOrderBizService; - @Resource UdiRelevanceService udiRelevanceService; @Resource - IoSplitFifoCodeService splitFifoCodeService; - @Resource GennerOrderUtils gennerOrderUtils; - + @Resource + BasicCollectBustypeService bustypeService; + @Resource + SysWorkplaceService sysWorkPlaceService; /** * 器械拆零处方赋码明细 @@ -84,10 +85,6 @@ public class IoCollectOrderCodeManController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } - @Resource - BasicCollectBustypeService bustypeService; - @Resource - SysWorkplaceService sysWorkPlaceService; /** * 器械拆零处方赋码（手动赋码) @@ -166,14 +163,14 @@ public class IoCollectOrderCodeManController extends BaseController { collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity); collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); } else { - collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1); + collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); } break; case 2: //不插入 if (collectOrderBiz == null) return ResultVOUtils.error(500, "非此单据追溯码！"); - int count = collectOrderBiz.getScanCount() + 1; - if (count > collectOrderBiz.getCount()) { + int count = IntUtil.value(collectOrderBiz.getScanCount()) + 1; + if (count > IntUtil.value(collectOrderBiz.getCount())) { return ResultVOUtils.error(500, "扫码数量超出！"); } collectOrderBiz.setScanCount(count); @@ -184,19 +181,19 @@ public class IoCollectOrderCodeManController extends BaseController { if (!IntUtil.value(addTagCodeReqeust.getInsert())) { if (collectOrderBiz == null) return ResultVOUtils.error(502, "非此单据追溯码！"); - int count1 = collectOrderBiz.getScanCount() + 1; + int count1 = IntUtil.value(collectOrderBiz.getScanCount()) + 1; if (count1 > collectOrderBiz.getCount()) { return ResultVOUtils.error(502, "扫码数量超出！"); } + collectOrderBiz.setScanCount(count1); } else { if (collectOrderBiz == null) { collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity); collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); } else { - collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1); + collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); } } - break; default: break; @@ -221,14 +218,14 @@ public class IoCollectOrderCodeManController extends BaseController { collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity); collectOrderBiz.setOrderIdFk(collectOrder.getBillNo()); } else { - collectOrderBiz.setScanCount(collectOrderBiz.getScanCount() + 1); + collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1); } break; case 2: //不插入 if (collectOrderBiz == null) return ResultVOUtils.error(500, "非此单据追溯码！"); - int count = collectOrderBiz.getScanCount() + 1; - if (count > collectOrderBiz.getCount()) { + int count = IntUtil.value(collectOrderBiz.getScanCount()) + 1; + if (count > IntUtil.value(collectOrderBiz.getCount())) { return ResultVOUtils.error(500, "扫码数量超出！"); } collectOrderBiz.setScanCount(count); @@ -239,10 +236,11 @@ public class IoCollectOrderCodeManController extends BaseController { if (!IntUtil.value(addTagCodeReqeust.getInsert())) { if (collectOrderBiz == null) return ResultVOUtils.error(502, "非此单据追溯码！"); - int count1 = collectOrderBiz.getScanCount() + 1; - if (count1 > collectOrderBiz.getCount()) { + int count1 = IntUtil.value(collectOrderBiz.getScanCount()) + 1; + if (count1 > IntUtil.value(collectOrderBiz.getCount())) { return ResultVOUtils.error(502, "扫码数量超出！"); } + collectOrderBiz.setScanCount(count1); } else { if (collectOrderBiz == null) { collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity); @@ -289,6 +287,16 @@ public class IoCollectOrderCodeManController extends BaseController { } + @PostMapping("/udiwms/ioSplit/collect/code/remove") + public BaseResponse removeCode(@RequestBody @Valid DeleteTageCodeRequest delete, + BindingResult bindingResult) { + + //1.减一，，，IoCollectOrderCodeMan-1 IoCollectOrderBiz-1 + + //2.删除 IoCollectOrderCodeMan-删除 IoCollectOrderBiz-数量 + return ResultVOUtils.error(""); + } + public IoCollectOrderBiz scanGenOrder(List udiRelevanceResponses, List collectOrderBizs, UdiEntity udiEntity) { for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) { diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 60ffce0b8..5a9f653a2 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -159,8 +159,6 @@ public class IoCollectOrderController extends BaseController { //1.校验是否全部自动赋码 - - //2.校验扫码是否完成 @@ -203,4 +201,8 @@ public class IoCollectOrderController extends BaseController { collectOrderService.clearOrder(); return ResultVOUtils.success(); } + + + + } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java index 4cb505cec..e5f1440a1 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicSkPrescribeEntity.java @@ -151,4 +151,8 @@ public class BasicSkPrescribeEntity { @TableField(value = "workPlaceCode") private Long workPlaceCode; + + @TableField(value = "addr") + private String addr; + } diff --git a/src/main/java/com/glxp/api/req/inout/DeleteTageCodeRequest.java b/src/main/java/com/glxp/api/req/inout/DeleteTageCodeRequest.java new file mode 100644 index 000000000..9ec42c4e8 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/DeleteTageCodeRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.req.inout; + +import lombok.Data; + +@Data +public class DeleteTageCodeRequest { + + + +} diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeAutoResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeAutoResponse.java index 13e8394c8..3ac53f742 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeAutoResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeAutoResponse.java @@ -18,6 +18,7 @@ public class CollectOrderCodeAutoResponse { * udi码、追溯码 */ private String udiCode; + private Long relId; /** * 处方单号/业务单号 diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java index 6d2507731..077690743 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java @@ -13,7 +13,7 @@ public class CollectOrderCodeManResponse { private String udiCode; - private Integer relId; + private Long relId; private String nameCode; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index afe9e78c3..6e57c90c5 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -87,6 +87,8 @@ public class IoCollectOrderService extends ServiceImpl list = orderService.filterList(filterOrderRequest); List collectOrderList = new ArrayList<>(); for (IoOrderResponse ioOrderEntity : list) { @@ -152,7 +154,7 @@ public class IoCollectOrderService extends ServiceImpl collectOrderList = new ArrayList<>(); for (BasicSkPrescribeEntity basicSkPrescribeEntity : basicSkPrescribeEntities) { - BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByAddr(String.valueOf(basicSkPrescribeEntity.getWorkPlaceCode())); + BasicCollectBustypeEntity collectBustypeEntity = collectBustypeService.findByAddr(String.valueOf(basicSkPrescribeEntity.getAddr())); if (collectBustypeEntity == null) continue; if (collectOrderMapper.exists(new LambdaQueryWrapper().eq(IoCollectOrder::getBillNo, basicSkPrescribeEntity.getCode()))) { diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index c7ee4fd79..a200ed1fa 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -919,7 +919,13 @@ public class IoAddInoutService { ioOrderDetailCodeEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc()); ioOrderDetailCodeEntity.setManufacturer(udiRelevanceResponse.getManufactory()); ioOrderDetailCodeEntity.setMeasname(udiRelevanceResponse.getMeasname()); - ioOrderDetailCodeEntity.setSpec(udiRelevanceResponse.getGgxh()); + if (StrUtil.isEmpty(udiRelevanceResponse.getGgxh())) { + ioOrderDetailCodeEntity.setSpec(udiRelevanceResponse.getBzgg()); + } else + ioOrderDetailCodeEntity.setSpec(udiRelevanceResponse.getGgxh()); + if (StrUtil.isEmpty(udiRelevanceResponse.getMeasname())) { + ioOrderDetailCodeEntity.setMeasname(udiRelevanceResponse.getUseLevelUnit()); + } ioOrderDetailCodeEntity.setSupId(codeTempEntity.getSupId()); ioOrderDetailCodeEntity.setProductType(codeTempEntity.getProductType()); if (codeTempEntity.getPrice() == null) {