yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、调整请领单服务流程传参 

2、pad接口-退货单-开始服务、结束服务增加服务指令流程处理
This commit is contained in:
1378012178@qq.com 2025-12-15 15:56:28 +08:00
parent 968db33eaa
commit 389fa3413d
4 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java
View File

@ -230,7 +230,7 @@ public class InvoicingThdApi {
} }
/** /**
* 退货-发起退货（临时接口，后续会删除） * 退货-发起退货
* *
* @param dto * @param dto
* @return * @return

1
nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdMainEntity.java
View File

@ -64,6 +64,7 @@ public class InvoicingThdMainEntity implements Serializable {
private String nuId; private String nuId;
/**长者id nu_biz_elder_info.id*/ /**长者id nu_biz_elder_info.id*/
private String elderId; private String elderId;
private String elderName;
/**是否已读 Y已读 N未读*/ /**是否已读 Y已读 N未读*/
private String izRead; private String izRead;

26
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java
View File

@ -474,7 +474,7 @@ public class QingLingServiceImpl implements IQinglingApi {
result.put("status", "success"); result.put("status", "success");
result.put("message", "提交成功"); result.put("message", "提交成功");
//结束请领车提交指令 //请领车-提交指令
InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity(); InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
orderEntity.setFlowCode("ql_sq");//指令流程flow_code 看接口有标明 orderEntity.setFlowCode("ql_sq");//指令流程flow_code 看接口有标明
orderEntity.setBizId(saveData.getQldNo());//请领单号 orderEntity.setBizId(saveData.getQldNo());//请领单号
@ -859,9 +859,9 @@ public class QingLingServiceImpl implements IQinglingApi {
orderEntity.setFlowCode("ql_ht");//指令流程flow_code 看接口有标明 orderEntity.setFlowCode("ql_ht");//指令流程flow_code 看接口有标明
orderEntity.setBizId(dto.getQldNo());//请领单号 orderEntity.setBizId(dto.getQldNo());//请领单号
orderEntity.setNuId(dto.getNuId()); orderEntity.setNuId(dto.getNuId());
orderEntity.setNuName(dto.getNuName()); // orderEntity.setNuName(dto.getNuName());
orderEntity.setCustomerId(dto.getElderId());//长者id orderEntity.setCustomerId(dto.getElderId());//长者id
orderEntity.setCustomerName(dto.getElderName());//长者姓名 // orderEntity.setCustomerName(dto.getElderName());//长者姓名
orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名 orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名
invoicingOrdersApi.flowQlht(orderEntity); invoicingOrdersApi.flowQlht(orderEntity);
@ -923,9 +923,11 @@ public class QingLingServiceImpl implements IQinglingApi {
QueryWrapper<NuInvoicingQldMain> qw = new QueryWrapper<>(); QueryWrapper<NuInvoicingQldMain> qw = new QueryWrapper<>();
qw.in("qld_no", dto.getQldNo().split(",")); qw.in("qld_no", dto.getQldNo().split(","));
List<NuInvoicingQldMain> list = invoicingQldMainService.list(qw); List<NuInvoicingQldMain> list = invoicingQldMainService.list(qw);
NuInvoicingQldMain one = list.get(0); Map<String, NuInvoicingQldMain> qldMap = list.stream()
dto.setNuId(one.getNuId()); .collect(Collectors.toMap(
dto.setElderId(one.getElderId()); NuInvoicingQldMain::getQldNo,
qld -> qld
));
String status = "4"; String status = "4";
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@ -939,8 +941,8 @@ public class QingLingServiceImpl implements IQinglingApi {
logData.setStatus(status);//单子操作状态 logData.setStatus(status);//单子操作状态
logData.setOpeBy(sysUser.getId());//操作人 logData.setOpeBy(sysUser.getId());//操作人
logData.setOpeTime(new Date());//操作时间 logData.setOpeTime(new Date());//操作时间
logData.setNuId(dto.getNuId());//护理单元id logData.setNuId(qldMap.get(qldNoArr[i]).getNuId());//护理单元id
logData.setElderId(dto.getElderId());//长者id logData.setElderId(qldMap.get(qldNoArr[i]).getElderId());//长者id
logList.add(logData); logList.add(logData);
} }
invoicingQldLogService.saveBatch(logList); invoicingQldLogService.saveBatch(logList);
@ -959,10 +961,10 @@ public class QingLingServiceImpl implements IQinglingApi {
InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity(); InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
orderEntity.setFlowCode("ql_ck");//指令流程flow_code 看接口有标明 orderEntity.setFlowCode("ql_ck");//指令流程flow_code 看接口有标明
orderEntity.setBizId(qldNoArr[i]);//请领单号 orderEntity.setBizId(qldNoArr[i]);//请领单号
orderEntity.setNuId(dto.getNuId()); orderEntity.setNuId(qldMap.get(qldNoArr[i]).getNuId());
orderEntity.setNuName(dto.getNuName()); // orderEntity.setNuName(dto.getNuName());
orderEntity.setCustomerId(dto.getElderId());//长者id orderEntity.setCustomerId(qldMap.get(qldNoArr[i]).getElderId());//长者id
orderEntity.setCustomerName(dto.getElderName());//长者姓名 // orderEntity.setCustomerName(dto.getElderName());//长者姓名
orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名 orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名
invoicingOrdersApi.flowQlck(orderEntity); invoicingOrdersApi.flowQlck(orderEntity);

32
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java
View File

@ -6,14 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.nu.entity.InvoicingThdGwcEntity; import com.nu.entity.*;
import com.nu.entity.InvoicingThdLogEntity;
import com.nu.entity.InvoicingThdMainEntity;
import com.nu.entity.NuKcslEntity;
import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo; import com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo;
import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper; import com.nu.modules.ConfigMaterial.mapper.ConfigMaterialInfoMapper;
import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo; import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo;
import com.nu.modules.cgd.service.INuWarehouseMaterialCrkInfoService; import com.nu.modules.cgd.service.INuWarehouseMaterialCrkInfoService;
import com.nu.modules.invoicing.api.IInvoicingOrdersApi;
import com.nu.modules.invoicing.api.ITuiHuoApi; import com.nu.modules.invoicing.api.ITuiHuoApi;
import com.nu.modules.nu.entity.NuInvoicingNuCrkLog; import com.nu.modules.nu.entity.NuInvoicingNuCrkLog;
import com.nu.modules.nu.entity.NuInvoicingNuKcsl; import com.nu.modules.nu.entity.NuInvoicingNuKcsl;
@ -77,6 +75,8 @@ public class ThdServiceImpl implements ITuiHuoApi {
private INuWarehouseMaterialCrkInfoService warehouseMaterialCrkInfoService; private INuWarehouseMaterialCrkInfoService warehouseMaterialCrkInfoService;
@Autowired @Autowired
private ConfigMaterialInfoMapper configMaterialInfoMapper; private ConfigMaterialInfoMapper configMaterialInfoMapper;
@Autowired
private IInvoicingOrdersApi invoicingOrdersApi;
@Override @Override
public IPage<InvoicingThdMainEntity> thdList(Integer pageNo, Integer pageSize, InvoicingThdMainEntity dto) { public IPage<InvoicingThdMainEntity> thdList(Integer pageNo, Integer pageSize, InvoicingThdMainEntity dto) {
@ -160,6 +160,12 @@ public class ThdServiceImpl implements ITuiHuoApi {
logData.setElderId(main.getElderId());//长者id logData.setElderId(main.getElderId());//长者id
thdLogMapper.insert(logData); thdLogMapper.insert(logData);
InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明
orderEntity.setPoolId(dto.getId());//退货主表id 入库时会根据更新为对应退货单号（入库时才生成的退货单号）
orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
invoicingOrdersApi.beginDyHtOrder(orderEntity);
return true; return true;
} }
} }
@ -524,6 +530,13 @@ public class ThdServiceImpl implements ITuiHuoApi {
logData.setElderId(main.getElderId());//长者id logData.setElderId(main.getElderId());//长者id
thdLogMapper.insert(logData); thdLogMapper.insert(logData);
InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明
orderEntity.setPoolId(dto.getId());//退货主表id 入库时会根据更新为对应退货单号（入库时才生成的退货单号）
orderEntity.setBizId(main.getThdNo());
orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
invoicingOrdersApi.finishDyThOrder(orderEntity);
return true; return true;
} }
} }
@ -560,6 +573,17 @@ public class ThdServiceImpl implements ITuiHuoApi {
logData.setElderId(main.getElderId());//长者id logData.setElderId(main.getElderId());//长者id
thdLogMapper.insert(logData); thdLogMapper.insert(logData);
InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
orderEntity.setFlowCode("dyth_cksh");//指令流程flow_code 看接口有标明
orderEntity.setBizId(main.getId());//退货主表id 入库时会根据更新为对应退货单号（入库时才生成的退货单号）
orderEntity.setNuId(dto.getNuId());
// orderEntity.setNuName(dto.getNuName());
orderEntity.setCustomerId(dto.getElderId());//长者id
// orderEntity.setCustomerName(dto.getElderName());//长者姓名
orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名
invoicingOrdersApi.flowDythCksh(orderEntity);
return true; return true;
} }