diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java index 91d65a9e..9f8f8c97 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java @@ -518,6 +518,12 @@ public class QingLingServiceImpl implements IQinglingApi { } } + /** + * 查询请领单信息 + * + * @param queryDto + * @return + */ @Override public IPage queryQld(InvoicingQldQueryEntity queryDto, Integer pageNo, Integer pageSize) { Page page = new Page<>(pageNo, pageSize); @@ -589,6 +595,12 @@ public class QingLingServiceImpl implements IQinglingApi { return resultPage; } + /** + * 请领单-请领单物料信息查询 + * + * @param queryDto + * @return + */ @Override public List queryQldWlInfo(InvoicingQldQueryEntity queryDto) { if (StringUtils.isBlank(queryDto.getQldNo())) { @@ -597,6 +609,12 @@ public class QingLingServiceImpl implements IQinglingApi { return invoicingQldInfoMapper.queryWlInfo(queryDto); } + /** + * 请领单-作废 + * + * @param dto + * @return + */ @Override @Transactional(rollbackFor = Exception.class) public Map cancellation(InvoicingQldMainEntity dto) { @@ -621,20 +639,23 @@ public class QingLingServiceImpl implements IQinglingApi { if ("3".equals(nowStatus)) { InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); p_.setFlowCode("ql_sq"); - p_.setNuId(one.getNuId()); - p_.setElderId(one.getElderId()); - InvoicingOrdersEntity v_ = invoicingQlOrdersApi.getQlOrderInfo(p_); - if (v_ != null) { - //有单子 但必须 点开始才行 - if ("N".equals(v_.getIzStart())) { - //未点击开始 - result.put("status", "faild"); - result.put("message", "请先开始指令"); - return result; - } - } else { + p_.setBizId(dto.getQldNo()); + Map j = invoicingQlOrdersApi.izCanGoOn(p_); + if(!j.get("error_code").equals("0")){ result.put("status", "faild"); - result.put("message", "未收到指令，无法作废"); + result.put("message", j.get("msg")); + return result; + } + } + //检测是否可作废 + if ("1".equals(nowStatus)) { + InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); + p_.setFlowCode("ql_ck"); + p_.setBizId(dto.getQldNo()); + Map j = invoicingQlOrdersApi.izCanCancel(p_); + if(!j.get("error_code").equals("0")){ + result.put("status", "faild"); + result.put("message", j.get("msg")); return result; } } @@ -658,12 +679,7 @@ public class QingLingServiceImpl implements IQinglingApi { //服务指令流程-作废 InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity(); orderEntity.setBizId(dto.getQldNo());//请领单号 - orderEntity.setNuId(dto.getNuId()); - orderEntity.setNuName(dto.getNuName()); - orderEntity.setElderId(dto.getElderId());//长者id - orderEntity.setElderName(dto.getElderName());//长者姓名 orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id - orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名 if ("1".equals(nowStatus)) { //已提交直接作废 orderEntity.setFlowCode("ql_zf");//指令流程flow_code 看接口有标明 @@ -672,7 +688,7 @@ public class QingLingServiceImpl implements IQinglingApi { if ("3".equals(nowStatus)) { //回退单作废 orderEntity.setFlowCode("ql_htzf");//指令流程flow_code 看接口有标明 - invoicingQlOrdersApi.flowQlhtzf(orderEntity); + invoicingQlOrdersApi.flowQlzf(orderEntity); } invoicingQldMainService.updateById(one); result.put("status", "success"); @@ -680,6 +696,12 @@ public class QingLingServiceImpl implements IQinglingApi { return result; } + /** + * 请领单-单子改为已读 + * + * @param dto + * @return + */ @Override public boolean transRead(InvoicingQldMainEntity dto) { UpdateWrapper uw = new UpdateWrapper<>(); @@ -709,6 +731,20 @@ public class QingLingServiceImpl implements IQinglingApi { @Transactional(rollbackFor = Exception.class) public Map confirmReceipt(InvoicingQldMainEntity dto) { Map result = Maps.newHashMap(); + + //检测是否已经开始服务 + { + InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); + p_.setFlowCode("ql_sh"); + p_.setBizId(dto.getQldNo()); + Map j = invoicingQlOrdersApi.izCanGoOn(p_); + if(!j.get("error_code").equals("0")){ + result.put("status", "faild"); + result.put("message", j.get("msg")); + return result; + } + } + //检测是否可以正常收货 if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "4")) { result.put("status", "faild"); @@ -722,28 +758,6 @@ public class QingLingServiceImpl implements IQinglingApi { String status = "5";//确认收货 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //检测是否已经开始服务 - { - InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); - p_.setFlowCode("ql_sqr"); - p_.setNuId(one.getNuId()); - p_.setElderId(one.getElderId()); - InvoicingOrdersEntity v_ = invoicingQlOrdersApi.getQlOrderInfo(p_); - if (v_ != null) { - //有单子 但必须 点开始才行 - if ("N".equals(v_.getIzStart())) { - //未点击开始 - result.put("status", "faild"); - result.put("message", "请先开始指令"); - return result; - } - } else { - result.put("status", "faild"); - result.put("message", "暂无服务指令"); - return result; - } - } - //主表改为已收货 UpdateWrapper mainUW = new UpdateWrapper<>(); mainUW.eq("qld_no", dto.getQldNo()); @@ -905,10 +919,29 @@ public class QingLingServiceImpl implements IQinglingApi { return result; } + /** + * 请领单-回退 + * + * @param dto + * @return + */ @Override @Transactional(rollbackFor = Exception.class) public Map orderReturn(InvoicingQldMainEntity dto) { Map result = Maps.newHashMap(); + //检测是否已经开始服务 + { + InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); + p_.setFlowCode("ql_ck"); + p_.setBizId(dto.getQldNo()); + Map j = invoicingQlOrdersApi.izCanGoOn(p_); + if(!j.get("error_code").equals("0")){ + result.put("status", "faild"); + result.put("message", j.get("msg")); + return result; + } + } + //检测是否可以正常回退 if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "1,4")) { result.put("status", "faild"); @@ -924,28 +957,6 @@ public class QingLingServiceImpl implements IQinglingApi { String status = "3"; LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //检测是否已经开始服务 - { - InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); - p_.setFlowCode("ql_ck"); - p_.setNuId(one.getNuId()); - p_.setElderId(one.getElderId()); - InvoicingOrdersEntity v_ = invoicingQlOrdersApi.getQlOrderInfo(p_); - if (v_ != null) { - //有单子 但必须 点开始才行 - if ("N".equals(v_.getIzStart())) { - //未点击开始 - result.put("status", "faild"); - result.put("message", "请先开始指令"); - return result; - } - } else { - result.put("status", "faild"); - result.put("message", "未收到指令，无法回退"); - return result; - } - } - //日志表插记录 NuInvoicingQldLog logData = new NuInvoicingQldLog(); logData.setQldNo(dto.getQldNo());//请领单号 @@ -968,11 +979,30 @@ public class QingLingServiceImpl implements IQinglingApi { return result; } + /** + * 请领单-出库(单个/批量) + * + * @param dto + * @return + */ @Override @Transactional(rollbackFor = Exception.class) public Map outbound(InvoicingQldMainEntity dto) { //出库一次只会有一个出库单了 Map map = new HashMap<>(); + //检测是否已经开始服务 + { + InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); + p_.setFlowCode("ql_ck"); + p_.setBizId(dto.getQldNo()); + Map j = invoicingQlOrdersApi.izCanGoOn(p_); + if(!j.get("error_code").equals("0")){ + map.put("status", "faild"); + map.put("message", j.get("msg")); + return map; + } + } + //检测单子状态是否正确 if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "1")) { map.put("status", "faild"); @@ -1013,28 +1043,6 @@ public class QingLingServiceImpl implements IQinglingApi { String status = "4"; LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //检测是否已经开始服务 - { - InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); - p_.setFlowCode("ql_ck"); - p_.setNuId(one.getNuId()); - p_.setElderId(one.getElderId()); - InvoicingOrdersEntity v_ = invoicingQlOrdersApi.getQlOrderInfo(p_); - if (v_ != null) { - //有单子 但必须 点开始才行 - if ("N".equals(v_.getIzStart())) { - //未点击开始 - map.put("status", "faild"); - map.put("message", "请先开始指令"); - return map; - } - } else { - map.put("status", "faild"); - map.put("message", "未收到指令，无法回退"); - return map; - } - } - //日志表插记录 NuInvoicingQldLog logData = new NuInvoicingQldLog(); logData.setQldNo(dto.getQldNo());//请领单号 @@ -1160,6 +1168,13 @@ public class QingLingServiceImpl implements IQinglingApi { // return map; // } + /** + * 请领单-调整物料数量 + * 传请领单号+物料id+物料数量 + * + * @param queryDto + * @return + */ @Override public boolean updateQldWlSl(InvoicingQldQueryEntity queryDto) { if (StringUtils.isBlank(queryDto.getQldNo()) || StringUtils.isBlank(queryDto.getWlId()) || queryDto.getQlNum() == null) { @@ -1205,6 +1220,12 @@ public class QingLingServiceImpl implements IQinglingApi { return result; } + /** + * 请领单-服务指令-开始服务 + * + * @param dto + * @return + */ @Override public Map startDirectiveServe(InvoicingQldQueryEntity dto) { //delete by caolei 2025-12-25 @@ -1270,7 +1291,14 @@ public class QingLingServiceImpl implements IQinglingApi { return invoicingOrdersApi.beginOrder(p_); } + /** + * 请领单-服务指令-结束服务 + * + * @param dto + * @return + */ @Override + @Transactional(rollbackFor = Exception.class) public Map finishDirectiveServe(InvoicingQldQueryEntity dto) { Map map = new HashMap(); map.put("error_code","0"); diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingQlOrdersApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingQlOrdersApi.java index 4c6e2e8e..dbd87442 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingQlOrdersApi.java +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingQlOrdersApi.java @@ -18,18 +18,24 @@ public interface IInvoicingQlOrdersApi { */ Map izCanSubmit(InvoicingOrdersEntity invoicingOrdersEntity); - /** - * 请领是否可出库 - * @param invoicingOrdersEntity - */ - Map izCanCk(InvoicingOrdersEntity invoicingOrdersEntity); - /** * 请领是否可重新提交 * @param invoicingOrdersEntity */ Map izCanReSubmit(InvoicingOrdersEntity invoicingOrdersEntity); + /** + * 请领是否可继续 + * @param invoicingOrdersEntity + */ + Map izCanGoOn(InvoicingOrdersEntity invoicingOrdersEntity); + + /** + * 请领是否可作废 + * @param invoicingOrdersEntity + */ + Map izCanCancel(InvoicingOrdersEntity invoicingOrdersEntity); + /** * 流程中提交时修改业务单号 * @param invoicingOrdersEntity @@ -66,10 +72,5 @@ public interface IInvoicingQlOrdersApi { */ void flowQlzf(InvoicingOrdersEntity invoicingOrdersEntity); - /** - * 请领流程-回退作废 ql_htzf - * @param invoicingOrdersEntity - */ - void flowQlhtzf(InvoicingOrdersEntity invoicingOrdersEntity); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java index 5e1e4902..1a32cea7 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java @@ -127,6 +127,12 @@ public class InvoicingOrders implements Serializable { private Date updateTime; /**是否删除 0未删除 1删除*/ private String delFlag; + /**删除日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date delTime; + /**删除人*/ + private String delEmp; /**发起人ID*/ private String initiatorId; /**发起人姓名*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java index 234e4132..eabb0872 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/InvoicingOrdersMapper.java @@ -26,6 +26,6 @@ public interface InvoicingOrdersMapper extends BaseMapper { List getPermissionEmps(@Param("directiveIds") String directiveIds); List getFlowList(InvoicingOrdersEntity invoicingOrdersEntity); InvoicingOrders getFlowOne(InvoicingOrders invoicingOrders); - void updateOrder(InvoicingOrders invoicingOrders); + void cancelOrder(InvoicingOrders invoicingOrders); InvoicingOrders getOrderOne(InvoicingOrders invoicingOrders); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml index 9c48709c..fd8edb30 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml @@ -205,59 +205,13 @@ - + update nu_biz_nu_invoicing_directive_order - set update_time = #{updateTime} - - ,update_emp = #{updateEmp} - - - ,begin_time = #{beginTime} - - - ,iz_start = #{izStart} - - - ,finish_time = #{finishTime} - - - ,iz_finish = #{izFinish} - - - ,biz_id = #{bizId} - - - ,iz_rollback = #{izRollback} - - - ,remarks = #{remarks} - - - ,del_flag = #{delFlag} - - - - and id = #{id} - - - and pool_id = #{poolId} - - - and biz_id = #{bizId} - - - and nu_id = #{nuId} - - - and elder_id = #{elderId} - - - and directive_id = #{directiveId} - - - and biz_type = #{bizType} - - + set del_flag = '1', + del_time = #{delTime}, + del_emp = #{delEmp}, + remarks = #{remarks} + where biz_id = #{bizId}