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

Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java

This commit is contained in:
1378012178@qq.com 2026-01-14 11:03:11 +08:00
parent f5c52e7f1d 95b43975d1
commit b986aff2b4
2 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,12 +59,6 @@ public class InvoicingApi {
@AutoLog(value = "采购单-采购信息-添加",clientType="app", operateType = 2) @AutoLog(value = "采购单-采购信息-添加",clientType="app", operateType = 2)
@PostMapping(value = "/addShoppingCartList") @PostMapping(value = "/addShoppingCartList")
public Result<String> addShoppingCartList(@RequestBody List<QgdInfoEntity> infoList) { public Result<String> addShoppingCartList(@RequestBody List<QgdInfoEntity> infoList) {
DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
qgdInfoEntityDto.setBizTypeCode("CGD-CGWL");
qgdInfoEntityDto.setBizType("采购单添加物料信息");
qgdInfoEntityDto.setBizNo("");
qgdInfoEntityDto.setOptType("添加");
directiveOrderApi.addBizLog(qgdInfoEntityDto);
Map<String, Object> pddMap = invoicingApi.queryPddStartInfo(null); Map<String, Object> pddMap = invoicingApi.queryPddStartInfo(null);
if(!toBoolean(pddMap.get("success"))){ if(!toBoolean(pddMap.get("success"))){
return Result.error(pddMap.get("message").toString()); return Result.error(pddMap.get("message").toString());

49
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
View File

@ -25,6 +25,7 @@ import com.nu.modules.invoicing.api.IInvoicingApi;
import com.nu.modules.invoicing.api.IPddApi; import com.nu.modules.invoicing.api.IPddApi;
import com.nu.modules.nubaseinfo.entity.NuBaseInfo; import com.nu.modules.nubaseinfo.entity.NuBaseInfo;
import com.nu.modules.nubaseinfo.mapper.NuBaseInfoMapper; import com.nu.modules.nubaseinfo.mapper.NuBaseInfoMapper;
import com.nu.modules.order.api.IDirectiveOrderApi;
import com.nu.modules.qgd.entity.QgdInfo; import com.nu.modules.qgd.entity.QgdInfo;
import com.nu.modules.qgd.mapper.QgdInfoMapper; import com.nu.modules.qgd.mapper.QgdInfoMapper;
import com.nu.modules.sysconfig.ISysConfigApi; import com.nu.modules.sysconfig.ISysConfigApi;
@ -110,6 +111,10 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
@Autowired @Autowired
private IPddApi pddApi; private IPddApi pddApi;
@Autowired
private IDirectiveOrderApi directiveOrderApi;
@Override @Override
public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) { public void rukuInfo(NuInvoicingCgdMain nuInvoicingCgdMain) {
} }
@ -397,8 +402,20 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
qgdInfoMapper.deleteById(id); qgdInfoMapper.deleteById(id);
} }
redisUtil.set("qgd"+qgdDate,qgdXlhInt); redisUtil.set("qgd"+qgdDate,qgdXlhInt);
DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
qgdInfoEntityDto.setBizTypeCode("CGD");
qgdInfoEntityDto.setBizType("采购单");
qgdInfoEntityDto.setBizNo(cgdNo);
qgdInfoEntityDto.setOptType("生成采购单信息");
directiveOrderApi.addBizLog(qgdInfoEntityDto);
} }
cgdMainList = BeanUtil.copyToList(mapList2,CgdMainEntity.class); cgdMainList = BeanUtil.copyToList(mapList2,CgdMainEntity.class);
return cgdMainList; return cgdMainList;
} }
@ -572,6 +589,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
cgdMain.setZfBy(loginUser.getRealname()); cgdMain.setZfBy(loginUser.getRealname());
cgdMain.setZfTime(new Date()); cgdMain.setZfTime(new Date());
baseMapper.updateById(cgdMain); baseMapper.updateById(cgdMain);
DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
qgdInfoEntityDto.setBizTypeCode("CGD");
qgdInfoEntityDto.setBizType("采购单");
qgdInfoEntityDto.setBizNo(cgdMainPar.getCgdNo());
qgdInfoEntityDto.setOptType("作废采购单信息");
directiveOrderApi.addBizLog(qgdInfoEntityDto);
return "1"; return "1";
} }
@ -894,6 +919,15 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
sxdMapper.insert(cgdSxd); sxdMapper.insert(cgdSxd);
} }
} }
NuInvoicingCgdMain cgdMainPar = baseMapper.selectById(cgdSxdEntityDto.getCgdId());
DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
qgdInfoEntityDto.setBizTypeCode("CGD");// 业务类型编码（如：ql）
qgdInfoEntityDto.setBizType("采购单");// 业务类型名称（如：请领）
qgdInfoEntityDto.setBizNo(cgdMainPar.getCgdNo());//业务主表单号（如：Q10120260109001）
qgdInfoEntityDto.setOptType("添加随行单");//操作类型（如：提交）
directiveOrderApi.addBizLog(qgdInfoEntityDto);
return "1"; return "1";
} }
@ -1207,6 +1241,13 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
result.put("cgdInfo",map); result.put("cgdInfo",map);
result.put("cgdTotalPrice",cgdMain.getTotalPrice()); result.put("cgdTotalPrice",cgdMain.getTotalPrice());
DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
qgdInfoEntityDto.setBizTypeCode("CGD");// 业务类型编码（如：ql）
qgdInfoEntityDto.setBizType("采购单");// 业务类型名称（如：请领）
qgdInfoEntityDto.setBizNo(cgdMain.getCgdNo());//业务主表单号（如：Q10120260109001）
qgdInfoEntityDto.setOptType("拣货");//操作类型（如：提交）
directiveOrderApi.addBizLog(qgdInfoEntityDto);
return result; return result;
} }
@ -1237,6 +1278,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
map.put("totalPrice",totalPrice.toString()); map.put("totalPrice",totalPrice.toString());
NuInvoicingCgdMain cgdMainNo = cgdMainMapper.selectById(cgdInfo.getCgdId());
DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
qgdInfoEntityDto.setBizTypeCode("CGD");// 业务类型编码（如：ql）
qgdInfoEntityDto.setBizType("采购单");// 业务类型名称（如：请领）
qgdInfoEntityDto.setBizNo(cgdMainNo.getCgdNo());//业务主表单号（如：Q10120260109001）
qgdInfoEntityDto.setOptType("改价");//操作类型（如：提交）
directiveOrderApi.addBizLog(qgdInfoEntityDto);
return map; return map;
} }