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

修改接口逻辑

This commit is contained in:
yangjun 2025-10-23 10:44:13 +08:00
parent b06dd9bd5d
commit 45830f8f16
5 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,10 @@ public class InvoicingApi {
@AutoLog(value = "请购单-请购信息-添加")
@PostMapping(value = "/addShoppingCartList")
public Result<String> addShoppingCartList(@RequestBody List<QgdInfoEntity> infoList) {
invoicingApi.addShoppingCartList(infoList);
String result = invoicingApi.addShoppingCartList(infoList);
if("1".equals( result)){
return Result.error("请购信息已存在，不可重复请购！");
}
return Result.OK("添加成功！");
}
@ -65,7 +68,7 @@ public class InvoicingApi {
@PostMapping(value = "/generatedPurchaseOrder")
public Result<List<CgdMainEntity>> generatedPurchaserder(@RequestBody List<CgdMainEntity> cgdMainList, HttpServletRequest req) {
List<CgdMainEntity> list = invoicingApi.generatedPurchaserder(cgdMainList);
return Result.OK(list);
return Result.OK("操作成功");
}
@ApiOperation(value = "查询采购单列表信息", notes = "查询采购单列表信息")

2
nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
View File

@ -90,7 +90,7 @@ public class ShiroConfig {
}
filterChainDefinitionMap.put("/api/tplink/videoStorage/**", "anon"); //视频缓存存储接口
filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口
// filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口
filterChainDefinitionMap.put("/iot/tq/api/electricityMeter/**", "anon"); //电表回调
filterChainDefinitionMap.put("/api/pad/baseInfo/**", "anon"); //电表回调
filterChainDefinitionMap.put("/iot/tq/api/waterMeter/**", "anon"); //水表回调

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

@ -69,6 +69,8 @@ public class CgdMainEntity implements Serializable {
private String jzdPath;
/**审核人*/
private String reviewedBy;
/**审核人*/
private String gysName;
// 总价
private BigDecimal totalPrice;
/**审核时间*/

2
nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/IInvoicingApi.java
View File

@ -13,7 +13,7 @@ public interface IInvoicingApi {
IPage<QgdInfoEntity> queryShoppingCartList(Integer pageNo, Integer pageSize, QgdInfoEntity qgdInfoEntityDto, HttpServletRequest req);
void addShoppingCartList(List<QgdInfoEntity> infoList);
String addShoppingCartList(List<QgdInfoEntity> infoList);
List<CgdMainEntity> generatedPurchaseViewOrder(List<QgdInfoEntity> infoList);

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

@ -200,10 +200,16 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
}
@Override
public void addShoppingCartList(List<QgdInfoEntity> infoList) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
public String addShoppingCartList(List<QgdInfoEntity> infoList) {
String result = "0";
for (QgdInfoEntity info : infoList) {
if(info.getPurchaseQuantity()!=null && info.getPurchaseQuantity()>0){
//查询是否有请购信息
QgdInfo qgdInfo = qgdInfoMapper.selectOne(new QueryWrapper<QgdInfo>().eq("wl_id",info.getWlId()).eq("nu_id",info.getNuId()));
if(qgdInfo!=null){
result = "1";
break;
}
//获取物料基础信息
ConfigMaterialInfo ConfigMaterialInfo = configMaterialInfoMapper.selectById(info.getWlId());
info.setWlName(ConfigMaterialInfo.getMaterialName());
@ -219,11 +225,12 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
} else if(StringUtils.equals("3",ConfigMaterialInfo.getMultiUnitType())){
info.setReferenceUnitPrice(ConfigMaterialInfo.getReferenceUnitPrice()+"");
}
QgdInfo qgdInfo = new QgdInfo();
BeanUtils.copyProperties(info,qgdInfo);
qgdInfoMapper.insert(qgdInfo);
QgdInfo qgdInfoIns = new QgdInfo();
BeanUtils.copyProperties(info,qgdInfoIns);
qgdInfoMapper.insert(qgdInfoIns);
}
}
return result;
}
@Override
@ -269,7 +276,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
cgdMain.setCgdNo(cgdNo);
cgdMain.setGysId(suppliersId);
cgdMain.setQgDate(new Date());
cgdMain.setQgBy(sysUser.getUsername());
cgdMain.setQgBy(sysUser.getRealname());
cgdMain.setGysLxr(ConfigSuppliersInfo.getPersonInCharge());
cgdMain.setGysLxrdh(ConfigSuppliersInfo.getContactNumber());
cgdMain.setGysOpenId(ConfigSuppliersInfo.getWechartId());
@ -305,6 +312,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
cgdInfo.setNuId(params.getNuId());
cgdInfo.setProcurementPrice(params.getReferenceUnitPrice());
cgdInfo.setKcsl(wlInfo.getKcsl());
cgdInfo.setTagType(wlInfo.getTagType());
cgdInfo.setTagName(wlInfo.getTagName());
cgdInfo.setMaterialImg(wlInfo.getMaterialImg());
BigDecimal sl = new BigDecimal(params.getPurchaseQuantity());
@ -355,7 +363,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
}
String qgdId = cgdMain.getQgdId();
for(String id : qgdId.split(",")){
baseMapper.deleteById(id);
qgdInfoMapper.deleteById(id);
}
redisUtil.set("qgd"+qgdDate,qgdXlhInt);
}
@ -439,7 +447,13 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
@Override
public void deleteQgInfoById(String id) {
qgdInfoMapper.deleteById( id);
if(id.indexOf(",")>-1){
for(String param : id.split(",")){
qgdInfoMapper.deleteById(param);
}
}else{
qgdInfoMapper.deleteById(id);
}
}
@Override