添加校验
This commit is contained in:
parent
e332b1943f
commit
1d9e7e986a
|
|
@ -23,4 +23,6 @@ public interface NuInvoicingCgdMainMapper extends BaseMapper<NuInvoicingCgdMain>
|
|||
List<NuInvoicingCgdMain> getCgrList(@Param("params") CgdMainEntity cgdMainEntityDto);
|
||||
|
||||
IPage<NuInvoicingCgdMain> calcList(Page<NuInvoicingCgdMain> page, @Param(Constants.WRAPPER) QueryWrapper<NuInvoicingCgdMain> queryWrapper);
|
||||
|
||||
List<NuInvoicingCgdMain> selecCgdWlsfzytList(@Param("wlId") String wlId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,4 +19,10 @@
|
|||
AND crk.crk_type = 1
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
<select id="selecCgdWlsfzytList" resultType="com.nu.modules.cgd.entity.NuInvoicingCgdMain">
|
||||
select a.* from nu_invoicing_cgd_main a
|
||||
inner join nu_invoicing_cgd_info b on a.id = b.cgd_id
|
||||
where a.cgd_type = '0' and a.status in (0,1) and b.wl_id = #{wlId}
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -1081,7 +1081,10 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
|
|||
xzsl = xzsl + jhNum;
|
||||
}
|
||||
crkInfo.setDqkcl(dqkcl);//当前库存量(操作后的库存量)
|
||||
crkInfoMapper.insert(crkInfo);
|
||||
crkInfo.setContent("采购单:"+cgdMain.getCgdNo());
|
||||
if(crkInfo.getCrkNum()>0){
|
||||
crkInfoMapper.insert(crkInfo);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -28,4 +28,6 @@ public interface NuInvoicingQldMainMapper extends BaseMapper<NuInvoicingQldMain>
|
|||
IPage<NuInvoicingQldMain> page(Page<Object> page, @Param("dto") InvoicingQldQueryEntity dto);
|
||||
|
||||
List<NuInvoicingQldLog> selectLogsByQldNos(@Param("qldNos") List<String> qldNos);
|
||||
|
||||
List<NuInvoicingQldMain> selectQldWlsfzyList(@Param("wlId") String wlId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,4 +103,13 @@
|
|||
</foreach>
|
||||
ORDER BY log.create_time asc
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
<select id="selectQldWlsfzyList" resultType="com.nu.entity.InvoicingQldInfoEntity">
|
||||
select a.* from nu_invoicing_qld_main a
|
||||
inner join nu_invoicing_qld_info b on a.qld_no = b.qld_no
|
||||
where a.status in (1,3,4) and b.wl_id = #{wlId}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -282,4 +282,12 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
|
|||
|
||||
|
||||
|
||||
@ApiOperation(value = "库房物料配置信息-物料是否占用", notes = "库房物料配置信息-物料是否占用")
|
||||
@GetMapping(value = "/queryWlsfzy")
|
||||
public Result<Map<String,Object>> queryWlsfzy(@RequestParam(name = "wlId", required = true) String wlId,@RequestParam(name = "nuId", required = true) String nuId) {
|
||||
Map<String,Object> map = blWarehouseMaterialInfoService.queryWlsfzy(wlId, nuId);
|
||||
return Result.OK(map);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ package com.nu.modules.warehouseMaterialInfo.service;
|
|||
import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description: 库房物料配置信息
|
||||
* @Author: jeecg-boot
|
||||
|
|
@ -16,4 +18,6 @@ public interface IBlWarehouseMaterialInfoService extends IService<BlWarehouseMat
|
|||
void deleteBatch(String ids);
|
||||
|
||||
void deleteAllWuliao(String nuId);
|
||||
|
||||
Map<String,Object> queryWlsfzy(String wlId, String nuId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,30 @@
|
|||
package com.nu.modules.warehouseMaterialInfo.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.nu.entity.QgdInfoEntity;
|
||||
import com.nu.modules.cgd.entity.NuInvoicingCgdMain;
|
||||
import com.nu.modules.cgd.mapper.NuInvoicingCgdMainMapper;
|
||||
import com.nu.modules.qgd.entity.QgdInfo;
|
||||
import com.nu.modules.qgd.mapper.QgdInfoMapper;
|
||||
import com.nu.modules.qld.entity.NuInvoicingQldGwc;
|
||||
import com.nu.modules.qld.entity.NuInvoicingQldMain;
|
||||
import com.nu.modules.qld.mapper.NuInvoicingQldGwcMapper;
|
||||
import com.nu.modules.qld.mapper.NuInvoicingQldMainMapper;
|
||||
import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo;
|
||||
import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper;
|
||||
import com.nu.modules.warehouseMaterialInfo.service.IBlWarehouseMaterialInfoService;
|
||||
import org.apache.shiro.SecurityUtils;
|
||||
import org.jeecg.common.system.vo.LoginUser;
|
||||
import org.jeecg.common.util.SpringContextUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description: 库房物料配置信息
|
||||
|
|
@ -22,6 +35,19 @@ import java.util.List;
|
|||
@Service
|
||||
public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseMaterialInfoMapper, BlWarehouseMaterialInfo> implements IBlWarehouseMaterialInfoService {
|
||||
|
||||
@Autowired
|
||||
private QgdInfoMapper qgdInfoMapper;
|
||||
|
||||
@Autowired
|
||||
private NuInvoicingCgdMainMapper nuInvoicingCgdMainMapper;
|
||||
|
||||
@Autowired
|
||||
private NuInvoicingQldGwcMapper qldGwcMapper;
|
||||
|
||||
@Autowired
|
||||
private NuInvoicingQldMainMapper qldMainMapper;
|
||||
|
||||
|
||||
@Override
|
||||
public void addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
|
|
@ -47,4 +73,42 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
|
|||
public void deleteAllWuliao(String nuId) {
|
||||
baseMapper.deleteAllWuliao(nuId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String,Object> queryWlsfzy(String wlId, String nuId) {
|
||||
Map<String,Object> map = new HashMap<>();
|
||||
//查询采购单数据是否有占用的
|
||||
List<NuInvoicingCgdMain> cgdMainList = nuInvoicingCgdMainMapper.selecCgdWlsfzytList(wlId);
|
||||
if(cgdMainList.size()>0){
|
||||
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("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("success",false);
|
||||
return map;
|
||||
}
|
||||
//查询请领单是否有占用的数据
|
||||
List<NuInvoicingQldMain> qldMainList = qldMainMapper.selectQldWlsfzyList(wlId);
|
||||
if(qldMainList.size()>0){
|
||||
map.put("message","请领单数据有占用,请先清空占用信息后再停用");
|
||||
map.put("success",false);
|
||||
return map;
|
||||
}
|
||||
//TODO 查询盘点单是否有占用的数据
|
||||
|
||||
map.put("message","无占用");
|
||||
map.put("success",true);
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue