From 763ccf57a19148aa0e411ee76ef960951c71e6df Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 12 Dec 2025 14:23:42 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=B3=BB=E7=BB=9FLoginUser=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E5=8F=AF=E8=BF=94=E5=9B=9E=E5=91=98=E5=B7=A5id=202?= =?UTF-8?q?=E3=80=81=E8=AF=B7=E9=A2=86=E8=BD=A6=E6=8F=90=E4=BA=A4=E6=97=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=87=E4=BB=A4=E6=B5=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/system/vo/LoginUser.java | 8 +++++++- .../com/nu/entity/InvoicingQldGwcEntity.java | 2 ++ .../qld/service/impl/QingLingServiceImpl.java | 17 ++++++++++++++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java index 7a0bc6f0..4a3cbe37 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java @@ -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; + } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldGwcEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldGwcEntity.java index df3967eb..aed800db 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldGwcEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingQldGwcEntity.java @@ -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; /** * 物料信息 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 e0e214dc..ab11d43f 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 @@ -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> 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; }