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

1、pad接口-退货-添加物料：逻辑增加老人判断 

2、pad接口-退货-入库:增加空物料检测
This commit is contained in:
1378012178@qq.com 2025-12-18 10:20:59 +08:00
parent 7d865f24e9
commit 420b0b2eef
4 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,11 +176,12 @@ public class ThdServiceImpl implements ITuiHuoApi {
public Map<String, Object> addThc(InvoicingThdGwcEntity dto) {
Map<String, Object> result = Maps.newHashMap();
//检测退货数量是否小于等于护理单元库存数量
QueryWrapper<NuInvoicingNuKcsl> kcslQW = new QueryWrapper<>();
kcslQW.eq("nu_id", dto.getNuId());
kcslQW.eq("wl_id", dto.getWlId());
NuInvoicingNuKcsl kcsl = nuKcslMapper.selectOne(kcslQW);
//检测退货数量是否小于等于护理单元库存数量 无需检查
// QueryWrapper<NuInvoicingNuKcsl> 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<NuInvoicingThdGwc> gwcQW = new QueryWrapper<>();
gwcQW.eq("pk_id", dto.getId());
List<NuInvoicingThdGwc> 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<NuInvoicingThdGwc> gwcQW = new QueryWrapper<>();
gwcQW.eq("pk_id", dto.getId());
List<NuInvoicingThdGwc> gwcList = thdGwcMapper.selectList(gwcQW);
wlList = gwcList.stream().map(NuInvoicingThdGwc::getWlId).collect(Collectors.toList());
//查出对应物料信息存储到info表和日志表中

13
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java
View File

@ -518,4 +518,17 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
public Result<?> 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));
}
}

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java
View File

@ -72,4 +72,6 @@ public interface IConfigServiceDirectiveService extends IService<ConfigServiceDi
List<ConfigServiceDirective> compareList(ConfigServiceDirective configServiceDirective);
String getSyncCode(String orgCode);
String updateSyncCode(String orgCode);
}

24
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java
View File

@ -668,7 +668,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
//如果还没生成生成过 直接生成
if (StringUtils.isBlank(syncCode)) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String apiAddress = opeApiAddress + "/api/services/directive/generateDirectiveSyncCode?orgCode=" + orgCode + "?createBy=" + sysUser.getRealname();
String apiAddress = opeApiAddress + "/api/services/directive/generateDirectiveSyncCode?orgCode=" + orgCode + "&createBy=" + sysUser.getRealname();
try {
String res = HttpRequestUtil.doGet(apiAddress, HttpRequestUtil.createDefaultHeaders());
JSONObject jsonResponse = JSON.parseObject(res);
@ -681,4 +681,26 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl<ConfigService
return syncCode;
}
@Override
public String updateSyncCode(String orgCode) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String syncCode = "";
JSONObject opeOpenUrl = sysConfigApi.getByKeyByDS("master", "ope_open_url");
String opeApiAddress = opeOpenUrl.getString("configValue");
if (opeApiAddress.endsWith("/")) {
opeApiAddress = opeApiAddress.substring(0, opeApiAddress.length() - 1);
}
String apiAddress = opeApiAddress + "/api/services/directive/generateDirectiveSyncCode?orgCode=" + orgCode + "&createBy=" + sysUser.getRealname();
try {
String res = HttpRequestUtil.doGet(apiAddress, HttpRequestUtil.createDefaultHeaders());
JSONObject jsonResponse = JSON.parseObject(res);
JSONObject r_ = jsonResponse.getJSONObject("result");
syncCode = r_.getString("orgCode");
} catch (Exception e) {
e.printStackTrace();
}
return syncCode;
}
}