From 7d865f24e959d68a343b3984b0a867e9c64dfe91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 18 Dec 2025 09:58:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-?= =?UTF-8?q?=E8=AF=B7=E9=A2=86=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=9B=9E=E9=80=80?= =?UTF-8?q?BUG=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/invoicing/order/service/impl/QlOrdersServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java index 69412ded..415f41a2 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java @@ -223,6 +223,7 @@ public class QlOrdersServiceImpl extends ServiceImpl Date: Thu, 18 Dec 2025 10:20:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81pad=E6=8E=A5=E5=8F=A3-=E9=80=80?= =?UTF-8?q?=E8=B4=A7-=E6=B7=BB=E5=8A=A0=E7=89=A9=E6=96=99=EF=BC=9A?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=A2=9E=E5=8A=A0=E8=80=81=E4=BA=BA=E5=88=A4?= =?UTF-8?q?=E6=96=AD=202=E3=80=81pad=E6=8E=A5=E5=8F=A3-=E9=80=80=E8=B4=A7-?= =?UTF-8?q?=E5=85=A5=E5=BA=93:=E5=A2=9E=E5=8A=A0=E7=A9=BA=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thd/service/impl/ThdServiceImpl.java | 26 ++++++++++++------- .../ConfigServiceDirectiveController.java | 13 ++++++++++ .../IConfigServiceDirectiveService.java | 2 ++ .../ConfigServiceDirectiveServiceImpl.java | 24 ++++++++++++++++- 4 files changed, 55 insertions(+), 10 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java index 61fba3a2..d0087c3f 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java @@ -176,11 +176,12 @@ public class ThdServiceImpl implements ITuiHuoApi { public Map addThc(InvoicingThdGwcEntity dto) { Map result = Maps.newHashMap(); - //检测退货数量是否小于等于护理单元库存数量 - QueryWrapper kcslQW = new QueryWrapper<>(); - kcslQW.eq("nu_id", dto.getNuId()); - kcslQW.eq("wl_id", dto.getWlId()); - NuInvoicingNuKcsl kcsl = nuKcslMapper.selectOne(kcslQW); + //检测退货数量是否小于等于护理单元库存数量 无需检查 +// QueryWrapper kcslQW = new QueryWrapper<>(); +// kcslQW.eq("nu_id", dto.getNuId()); +// kcslQW.eq("wl_id", dto.getWlId()); +// kcslQW.eq("elder_id",dto.getElderId()); +// NuInvoicingNuKcsl kcsl = nuKcslMapper.selectOne(kcslQW); // if (kcsl == null || kcsl.getWlNum() == null || kcsl.getWlNum() < dto.getThNum()) { // //护理单元无此物料/存量小于退货数量 // result.put("status", "numError"); @@ -253,6 +254,11 @@ public class ThdServiceImpl implements ITuiHuoApi { qw.eq("id", dto.getId()); NuInvoicingThdMain main = thdMainMapper.selectOne(qw); + //获取购物车物料数据 + QueryWrapper gwcQW = new QueryWrapper<>(); + gwcQW.eq("pk_id", dto.getId()); + List gwcList = thdGwcMapper.selectList(gwcQW); + //先进行单子检测 { //检测单子状态是否正确 @@ -269,6 +275,12 @@ public class ThdServiceImpl implements ITuiHuoApi { // result.put("message", "以下物料退货数量大于护理单元库存数量：" + wls); // return result; // } + //未添加退货物料检测 + if(CollectionUtils.isEmpty(gwcList)){ + result.put("status", "faild"); + result.put("message", "未添加物料"); + return result; + } } //处理数据 主表当前数据：main @@ -328,10 +340,6 @@ public class ThdServiceImpl implements ITuiHuoApi { //购物车数据 挪到info表里 //======================================================================== - //获取购物车物料数据 - QueryWrapper gwcQW = new QueryWrapper<>(); - gwcQW.eq("pk_id", dto.getId()); - List gwcList = thdGwcMapper.selectList(gwcQW); wlList = gwcList.stream().map(NuInvoicingThdGwc::getWlId).collect(Collectors.toList()); //查出对应物料信息存储到info表和日志表中 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java index a5ceafa4..484c61fa 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java @@ -518,4 +518,17 @@ public class ConfigServiceDirectiveController extends JeecgController getSyncCode(@RequestParam("orgCode") String orgCode) { return Result.OK(configServiceDirectiveService.getSyncCode(orgCode)); } + + /** + * 更新镜像码 + * 存储在管理平台 + * + * @param orgCode + * @return + */ + @ApiOperation(value = "服务指令-更新镜像码", notes = "服务指令-更新镜像码") + @GetMapping(value = "/updateSyncCode") + public Result updateSyncCode(@RequestParam("orgCode") String orgCode) { + return Result.OK(configServiceDirectiveService.updateSyncCode(orgCode)); + } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java index 269d3126..eb0faeb9 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java @@ -72,4 +72,6 @@ public interface IConfigServiceDirectiveService extends IService compareList(ConfigServiceDirective configServiceDirective); String getSyncCode(String orgCode); + + String updateSyncCode(String orgCode); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index 074eab2b..cd7debce 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -668,7 +668,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl