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

修改bug

This commit is contained in:
yangjun 2025-10-30 14:14:47 +08:00
parent 3a080ebef0
commit 368538716a
7 changed files with 112 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/ConfigMaterial/mapper/xml/ConfigMaterialInfoMapper.xml
View File

@ -20,7 +20,7 @@
<select id="getConfiguredList" resultType="com.nu.modules.ConfigMaterial.entity.ConfigMaterialInfo">
select * from nu_config_material_info a
where id not in ( select wl_id from nu_warehouse_material_info)
where del_flag = '0' and iz_enabled = '0' and id not in ( select wl_id from nu_warehouse_material_info where del_flag = '0' and iz_enabled = '0' )
<if test="param.checkId != null and param.checkId != ''">
and id not in ( ${param.checkId} )
</if>

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

@ -173,6 +173,8 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
if(StringUtils.isNotBlank(materialInfoEntityDto.getIsWaring()) && "1".equals(materialInfoEntityDto.getIsWaring())){
queryWrapper.apply("kcsl <= lower_limit");
}
queryWrapper.eq("del_flag","0");
queryWrapper.eq("izEnabled","0");
Page<BlWarehouseMaterialInfo> page = new Page<>(pageNo, pageSize);
List<BlWarehouseMaterialInfo> list = mterialInfoMapper.selectList(page,queryWrapper);
IPage<MaterialInfoEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());

69
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
View File

@ -87,6 +87,7 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
if (StringUtils.isNotBlank(blWarehouseMaterialInfo.getMedicationId())) {
queryWrapper.apply("a.medication_id = {0}", blWarehouseMaterialInfo.getMedicationId());
}
queryWrapper.eq("del_flag","0");
Page<BlWarehouseMaterialInfo> page = new Page<BlWarehouseMaterialInfo>(pageNo, pageSize);
IPage<BlWarehouseMaterialInfo> pageList = blWarehouseMaterialInfoService.page(page, queryWrapper);
return Result.OK(pageList);
@ -155,11 +156,11 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
*/
@AutoLog(value = "库房物料配置信息-批量删除")
@ApiOperation(value = "库房物料配置信息-批量删除", notes = "库房物料配置信息-批量删除")
@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
@GetMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.blWarehouseMaterialInfoService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
return Result.OK("移除成功!");
}
/**
@ -216,11 +217,67 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
@PostMapping(value = "/addBatch")
public Result<String> addBatch(@RequestBody List<BlWarehouseMaterialInfo> list) {
// for( BlWarehouseMaterialInfo blWarehouseMaterialInfo : list){
// blWarehouseMaterialInfoService.save(blWarehouseMaterialInfo);
// }
blWarehouseMaterialInfoService.saveBatch(list);
return Result.OK("添加成功！");
}
/**
* 添加全部物料至仓库
*
* @param
* @return
*/
@AutoLog(value = "添加全部物料至仓库")
@ApiOperation(value = "添加全部物料至仓库", notes = "添加全部物料至仓库")
@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
@PostMapping(value = "/addAllWuliao")
public Result<String> addAllWuliao(@RequestBody BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
blWarehouseMaterialInfoService.addAllWuliao(blWarehouseMaterialInfo);
return Result.OK("添加成功！");
}
/**
* 移除库房全部物料
*
* @param nuId
* @return
*/
@AutoLog(value = "移除库房全部物料")
@ApiOperation(value = "移除库房全部物料", notes = "移除库房全部物料")
@RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
@GetMapping(value = "/deleteAllWuliao")
public Result<String> deleteAllWuliao(@RequestParam(name = "nuId", required = true) String nuId) {
blWarehouseMaterialInfoService.remove(new QueryWrapper<BlWarehouseMaterialInfo>().eq("nu_id", nuId).apply("kcsl - 0 = 0"));
return Result.OK("移除成功!");
}
/**
* 根据nuId查询库存数量大于0的数据
*
* @param blWarehouseMaterialInfo
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "库房物料配置信息-分页列表查询")
@ApiOperation(value = "查询库存数量大于0的数据", notes = "查询库存数量大于0的数据")
@GetMapping(value = "/sfkytyList")
public Result<IPage<BlWarehouseMaterialInfo>> sfkytyList(BlWarehouseMaterialInfo blWarehouseMaterialInfo,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<BlWarehouseMaterialInfo> queryWrapper = QueryGenerator.initQueryWrapper(blWarehouseMaterialInfo, req.getParameterMap());
queryWrapper.eq("del_flag","0");
queryWrapper.eq("iz_enabled","0");
queryWrapper.apply("kcsl - 0 > 0");
Page<BlWarehouseMaterialInfo> page = new Page<BlWarehouseMaterialInfo>(pageNo, pageSize);
IPage<BlWarehouseMaterialInfo> pageList = blWarehouseMaterialInfoService.page(page, queryWrapper);
return Result.OK(pageList);
}
}

3
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/BlWarehouseMaterialInfoMapper.java
View File

@ -20,4 +20,7 @@ public interface BlWarehouseMaterialInfoMapper extends BaseMapper<BlWarehouseMat
List<BlWarehouseMaterialInfo> queryInvoicingList(Page<BlWarehouseMaterialInfo> page, QueryWrapper<BlWarehouseMaterialInfo> queryWrapper);
List<BlWarehouseMaterialInfo> getRemainingList(@Param("params") BlWarehouseMaterialInfo blWarehouseMaterialInfo);
void batchInsert(@Param("list")List<BlWarehouseMaterialInfo> list);
}

22
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/mapper/xml/BlWarehouseMaterialInfoMapper.xml
View File

@ -36,4 +36,26 @@
</select>
<select id="getRemainingList" resultType="com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo">
select id as wl_id from nu_config_material_info where id not in (select wl_id from nu_warehouse_material_info where del_flag = '0') and upper_limit is not null and lower_limit is not null and del_flag = '0' and iz_enabled = '0'
</select>
<insert id="batchInsert">
INSERT INTO nu_warehouse_material_info (
id, create_by, create_time,del_flag, nu_id,wl_id,kcsl,iz_enabled
) VALUES
<foreach collection="list" item="item" separator=",">
(
#{item.id},
#{item.createBy},
#{item.createTime},
'0',
#{item.nuId},
#{item.wlId},
'0',
'0'
)
</foreach>
</insert>
</mapper>

1
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/IBlWarehouseMaterialInfoService.java
View File

@ -11,4 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IBlWarehouseMaterialInfoService extends IService<BlWarehouseMaterialInfo> {
void addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo);
}

20
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java
View File

@ -3,10 +3,15 @@ package com.nu.modules.warehouseMaterialInfo.service.impl;
import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo;
import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper;
import com.nu.modules.warehouseMaterialInfo.service.IBlWarehouseMaterialInfoService;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.SpringContextUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import java.util.Date;
import java.util.List;
/**
* @Description: 库房物料配置信息
* @Author: jeecg-boot
@ -16,4 +21,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@Service
public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseMaterialInfoMapper, BlWarehouseMaterialInfo> implements IBlWarehouseMaterialInfoService {
@Override
public void addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
LoginUser loginUser = SpringContextUtils.getBean(LoginUser.class);
//获取仓库nuid
String nuId = blWarehouseMaterialInfo.getNuId();
//获取所有剩余的物料信息，并且去掉库存上限或者下限为空的数据
List<BlWarehouseMaterialInfo> list =baseMapper.getRemainingList(blWarehouseMaterialInfo);
//将所有查询到的物料进行批量新增
for(BlWarehouseMaterialInfo blWarehouseMaterialInfo1:list){
blWarehouseMaterialInfo1.setNuId(nuId);
blWarehouseMaterialInfo1.setCreateBy(loginUser.getUsername());
blWarehouseMaterialInfo1.setCreateTime(new Date());
}
baseMapper.batchInsert(list);
}
}