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

1、系统LoginUser工具可返回员工id 

2、请领车提交时增加指令流处理
This commit is contained in:
1378012178@qq.com 2025-12-12 14:23:42 +08:00
parent fc6aa28cab
commit 763ccf57a1
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
View File

@ -97,7 +97,7 @@ public class LoginUser {
* 状态(1：正常 2：冻结 ）
*/
private Integer status;
private Integer delFlag;
/**
* 同步工作流引擎1同步0不同步
@ -139,4 +139,10 @@ public class LoginUser {
/**设备id uniapp推送用*/
private String clientId;
/**
* 员工id
*/
@SensitiveField
private String employessId;
}

2
nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldGwcEntity.java
View File

@ -51,10 +51,12 @@ public class InvoicingQldGwcEntity {
* nuid nu_base_info.nu_id
*/
private String nuId;
private String nuName;
/**
* 长者id nu_biz_elder_info.id
*/
private String elderId;
private String elderName;
/**
* 物料信息

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

@ -16,6 +16,7 @@ import com.nu.modules.ConfigMaterial.service.IConfigMaterialCategoryService;
import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo;
import com.nu.modules.cgd.service.INuWarehouseMaterialCrkInfoService;
import com.nu.modules.elder.api.IElderInfoApi;
import com.nu.modules.invoicing.api.IInvoicingOrdersApi;
import com.nu.modules.invoicing.api.IQinglingApi;
import com.nu.modules.nu.entity.NuInvoicingNuCrkLog;
import com.nu.modules.nu.entity.NuInvoicingNuKcsl;
@ -100,6 +101,8 @@ public class QingLingServiceImpl implements IQinglingApi {
@Lazy
@Autowired
private QingLingServiceImpl ownService;
@Autowired
private IInvoicingOrdersApi invoicingOrdersApi;
@Override
public List<Map<String, Object>> getMaterialTreeData(MaterialCategoryEntity materialCategoryEntity) {
@ -456,7 +459,19 @@ public class QingLingServiceImpl implements IQinglingApi {
result.put("status", "success");
result.put("message", "提交成功");
//todo 购物车提交（把请领物料添加好后 点击提交） 护理员操作的 通知给库管
//结束请领车提交指令
InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
orderEntity.setFlowCode("ql_sq");//指令流程flow_code 看接口有标明
orderEntity.setBizId(saveData.getQldNo());//请领单号
orderEntity.setNuId(saveData.getNuId());
orderEntity.setNuName(dto.getNuName());
orderEntity.setCustomerId(saveData.getElderId());//长者id
orderEntity.setCustomerName(dto.getElderName());//长者姓名
orderEntity.setInitiatorId(sysUser.getEmployessId());//员工id
orderEntity.setInitiatorName(sysUser.getRealname());//员工姓名
invoicingOrdersApi.flowQlsq(orderEntity);
return result;
}