diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java index 1283c58ff..3b31213da 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitController.java @@ -8,6 +8,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.inout.IoSplitCodeEntity; import com.glxp.api.entity.thrsys.BasicInsChdrugEntity; import com.glxp.api.req.inout.AddTagCodeReqeust; @@ -18,6 +19,7 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoSplitCodeDetailResponse; import com.glxp.api.service.basic.*; +import com.glxp.api.service.collect.IoCollectOrderService; import com.glxp.api.service.inout.IoSplitCodeDetailService; import com.glxp.api.service.inout.IoSplitCodeService; import com.glxp.api.service.inout.IoSplitFifoCodeService; @@ -56,6 +58,7 @@ public class IoSplitController extends BaseController { BasicSkPrescribeService basicSkPrescribeService; @Resource BasicSkPrescribeItemCodeService basicSkPrescribeItemCodeService; + /** * 器械拆零按码查询 * @@ -94,6 +97,7 @@ public class IoSplitController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + /** * 器械拆零按扫码查询处方赋码明细 * @@ -113,7 +117,32 @@ public class IoSplitController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } + @Resource + IoCollectOrderService collectOrderService; + /** + * 开始自动赋码 + * + * @return + */ + @PostMapping("/udiwms/ioSplit/material/order/split") + public BaseResponse startSplit(@RequestBody @Valid AddTagCodeReqeust addTagCodeReqeust, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + IoCollectOrder collectOrder = collectOrderService.getByBillNo(addTagCodeReqeust.getBillNo()); + if (collectOrder == null) { + return ResultVOUtils.error(500, "未找到单据"); + } + + //未拆零 + if (IntUtil.value(collectOrder.getSplitStatus()) != 0) { + splitCodeService.orderAutoTagCode(collectOrder); + } + + return ResultVOUtils.success("后台已开始赋码,请稍后刷新查看"); + } /** * 器械拆零处方赋码(手动赋码) diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index 8e0bca905..09552a85d 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java @@ -132,6 +132,19 @@ public class IoCollectOrder implements Serializable { @TableField(value = "tagStatus") private Integer tagStatus; + /** + * 拆零状态:0:未拆零,1,正在拆零;2,已完成;3.拆零失败 + */ + @TableField(value = "splitStatus") + private Integer splitStatus; + + /** + * 拆零异常信息 + */ + @TableField(value = "splitMsg") + private String splitMsg; + + /** * 处方赋码信息 */ diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java index 6a37ca4d0..cb6655262 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java @@ -230,18 +230,11 @@ public class IoSplitCodeService extends ServiceImpl