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

修改功能

This commit is contained in:
yangjun 2025-12-05 16:38:41 +08:00
parent fea4fc1815
commit 936b4ebea8
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/controller/NuWarehouseMaterialCrkInfoController.java
View File

@ -10,6 +10,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
@ -70,6 +72,7 @@ public class NuWarehouseMaterialCrkInfoController extends JeecgController<NuWare
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<NuWarehouseMaterialCrkInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuWarehouseMaterialCrkInfo, req.getParameterMap());
queryWrapper.like(StringUtils.isNotBlank(nuWarehouseMaterialCrkInfo.getParamDate()),"create_time", nuWarehouseMaterialCrkInfo.getParamDate());
Page<NuWarehouseMaterialCrkInfo> page = new Page<NuWarehouseMaterialCrkInfo>(pageNo, pageSize);
IPage<NuWarehouseMaterialCrkInfo> pageList = nuWarehouseMaterialCrkInfoService.page(page, queryWrapper);
return Result.OK(pageList);

9
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/entity/NuWarehouseMaterialCrkInfo.java
View File

@ -4,10 +4,8 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.*;
import org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
@ -95,4 +93,7 @@ public class NuWarehouseMaterialCrkInfo implements Serializable {
private BigDecimal newPrice;
@Dict(dicCode = "crk_status")
private String crkStatus;
@TableField(exist = false)
private String paramDate;
}

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

@ -87,34 +87,34 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
}
}
if ("1".equals(sfxkcsl)){
map.put("message","库存数量不为0，请先清空库存数量后再停用");
map.put("message","库存数量不为0，请先清空库存数量后再进行操作");
}
//查询采购单数据是否有占用的
List<NuInvoicingCgdMain> cgdMainList = nuInvoicingCgdMainMapper.selecCgdWlsfzytList(wlId);
if(cgdMainList.size()>0){
map.put("message","采购单数据有占用，请先清空占用信息后再停用");
map.put("message","采购单数据有占用，请先清空占用信息后再进行操作");
map.put("success",false);
return map;
}
//查询采购车的购物数据是否有
List<QgdInfo> qgdInfoList = qgdInfoMapper.selectList(new QueryWrapper<QgdInfo>().eq("wl_id", wlId));
if(qgdInfoList.size()>0){
map.put("message","采购单购物车数据有占用，请先清空占用信息后再停用");
map.put("message","采购单购物车数据有占用，请先清空占用信息后再进行操作");
map.put("success",false);
return map;
}
//查询请领单购物车是否有数据
List<NuInvoicingQldGwc> qldGwcList = qldGwcMapper.selectList(new QueryWrapper<NuInvoicingQldGwc>().eq("wl_id", wlId));
if(qldGwcList.size()>0){
map.put("message","请领单购物车有占用，请先清空占用信息后再停用");
map.put("message","请领单购物车有占用，请先清空占用信息后再进行操作");
map.put("success",false);
return map;
}
//查询请领单是否有占用的数据
List<NuInvoicingQldMain> qldMainList = qldMainMapper.selectQldWlsfzyList(wlId);
if(qldMainList.size()>0){
map.put("message","请领单数据有占用，请先清空占用信息后再停用");
map.put("message","请领单数据有占用，请先清空占用信息后再进行操作");
map.put("success",false);
return map;
}