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

去掉无用的字段

This commit is contained in:
yangjun 2026-05-06 13:10:33 +08:00
parent 9c38e80a86
commit 86f746b3e4
17 changed files with 4 additions and 1100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,10 +78,6 @@ public class InvoicingApi {
@AutoLog(value = "采购单-采购信息-添加",clientType="app", operateType = 2)
@PostMapping(value = "/addShoppingCartList")
public Result<String> addShoppingCartList(@RequestBody List<QgdInfoEntity> infoList) {
// Map<String, Object> pddMap = invoicingApi.queryPddStartInfo(null);
// if(!toBoolean(pddMap.get("success"))){
// return Result.error(pddMap.get("message").toString());
// }
Integer maxCount = 100;//购物车最大数量
String result = invoicingApi.addShoppingCartList(infoList,maxCount);
if("1".equals( result)){
@ -102,10 +98,6 @@ public class InvoicingApi {
@AutoLog(value = "采购单-修改购物车采购信息",clientType="app", operateType = 3)
@PostMapping(value = "/eddShoppingCartList")
public Result<String> eddShoppingCartList(@RequestBody QgdInfoEntity qgdInfoEntity) {
Map<String, Object> pddMap = invoicingApi.queryPddStartInfo(null);
if(!toBoolean(pddMap.get("success"))){
return Result.error(pddMap.get("message").toString());
}
String result = invoicingApi.eddShoppingCartList(qgdInfoEntity);
if("1".equals( result)){
return Result.error("采购信息已存在，不可重复采购！");
@ -119,10 +111,6 @@ public class InvoicingApi {
@AutoLog(value = "采购单-生成采购单预览信息",clientType="app")
@PostMapping(value = "/generatedPurchaseViewOrder")
public Result<Object> generatedPurchaseViewOrder(@RequestBody List<QgdInfoEntity> infoList, HttpServletRequest req) {
Map<String, Object> pddMap = invoicingApi.queryPddStartInfo(null);
if(!toBoolean(pddMap.get("success"))){
return Result.error(pddMap.get("message").toString());
}
Map<String,Object> list = invoicingApi.generatedPurchaseViewOrder(infoList);
if(list.get("status").equals("2")){
return Result.error(list.get("errorMessage").toString());
@ -133,11 +121,6 @@ public class InvoicingApi {
@AutoLog(value = "采购单-生成采购单信息",clientType="app",operateType = 2)
@PostMapping(value = "/generatedPurchaseOrder")
public Result<List<CgdMainEntity>> generatedPurchaserder(@RequestBody List<CgdMainEntity> cgdMainList, HttpServletRequest req) {
Map<String, Object> pddMap = invoicingApi.queryPddStartInfo(null);
if(!toBoolean(pddMap.get("success"))){
return Result.error(pddMap.get("message").toString());
}
List<CgdMainEntity> list = invoicingApi.generatedPurchaserder(cgdMainList);
return Result.OK("操作成功");
}
@ -385,10 +368,6 @@ public class InvoicingApi {
@AutoLog(value = "采购单-库存预警添加全部物料",clientType="app", operateType = 2)
@PostMapping(value = "/addWaringAll")
public Result<String> addWaringAll(@RequestBody CgdInfoEntity cgdInfoEntityDto) {
Map<String, Object> pddMap = invoicingApi.queryPddStartInfo(null);
if(!toBoolean(pddMap.get("success"))){
return Result.error(pddMap.get("message").toString());
}
if(StringUtils.isEmpty(cgdInfoEntityDto.getNuId())){
return Result.error("请选择库房");
}
@ -407,10 +386,6 @@ public class InvoicingApi {
@AutoLog(value = "采购单-拣货物料",clientType="app", operateType = 2)
@PostMapping(value = "/pickingInfo")
public Result<Map<String,Object>> pickingInfo(@RequestBody CgdInfoEntity cgdInfoEntityDto) {
// Map<String, Object> pddMap = invoicingApi.queryPddStartInfo(null);
// if(!toBoolean(pddMap.get("success"))){
// return Result.error(pddMap.get("message").toString());
// }
Map<String,Object> result = invoicingApi.pickingInfo(cgdInfoEntityDto);
if(StringUtils.equals("2",result.get("status").toString())){
return Result.error("入库数量错误，超过采购数量");
@ -425,10 +400,6 @@ public class InvoicingApi {
@AutoLog(value = "采购单-改价",clientType="app", operateType = 3)
@PostMapping(value = "/editPrice")
public Result<Map<String,String>> editPrice(@RequestBody CgdInfoEntity cgdInfoEntityDto) {
Map<String, Object> pddMap = invoicingApi.queryPddStartInfo(null);
if(!toBoolean(pddMap.get("success"))){
return Result.error(pddMap.get("message").toString());
}
Map<String,String> result = invoicingApi.editPrice(cgdInfoEntityDto);
return Result.OK(result);
}

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

@ -1,177 +0,0 @@
package com.nu.modules.pad.invoicing.api;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.nu.entity.*;
import com.nu.modules.invoicing.api.IPddApi;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
/**
* 采购单pad接口
*/
@RestController
@RequestMapping("/api/pad/invoicing/pdd")
public class InvoicingPddApi {
@Autowired
private IPddApi pddApi;
@ApiOperation(value = "盘点单-查询单据信息", notes = "盘点单-查询单据信息")
@GetMapping(value = "/queryPddList")
public Result<IPage<InvoicingPddMainEntity>> queryPddList(InvoicingPddMainEntity invoicingPddMainEntity,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
IPage<InvoicingPddMainEntity> pageList = pddApi.queryPddList(pageNo, pageSize, invoicingPddMainEntity,req);
return Result.OK(pageList);
}
@ApiOperation(value="盘点单-盘点信息-添加", notes="盘点单-盘点信息-添加")
@AutoLog(value = "盘点单-盘点信息-添加",clientType="app", operateType = 2)
@PostMapping(value = "/addPddMain")
public Result<Object> addPddMain(@RequestBody InvoicingPddMainEntity invoicingPddMainEntity) {
if(StringUtils.isBlank(invoicingPddMainEntity.getNuId())){
return Result.error("参数错误，请选择库房");
}
Map<String,Object> result = pddApi.addPddMain(invoicingPddMainEntity);
if ((boolean)result.get("success")){
return Result.OK(result.get("message"));
}else{
return Result.error(result.get("message").toString());
}
}
@ApiOperation(value = "盘点单-查询盘点单详细信息", notes = "盘点单-查询盘点单详细信息")
@GetMapping(value = "/queryPddInfoList")
public Result<IPage<InvoicingPddInfoEntity>> queryPddInfoList(InvoicingPddInfoEntity invoicingPddInfoEntity,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
IPage<InvoicingPddInfoEntity> pageList = pddApi.queryPddInfoList(pageNo, pageSize, invoicingPddInfoEntity,req);
return Result.OK(pageList);
}
@ApiOperation(value="盘点单-修改盘点单物料的盘点信息", notes="盘点单-修改盘点单物料的盘点信息")
@AutoLog(value = "盘点单-修改盘点单物料的盘点信息",clientType="app", operateType = 2)
@PostMapping(value = "/editPddInfo")
public Result<Object> editPddInfo(@RequestBody InvoicingPddInfoEntity invoicingPddInfoEntity) {
if(StringUtils.isBlank(invoicingPddInfoEntity.getId())){
return Result.error("参数错误，请选择盘点单");
}
if(StringUtils.isBlank(invoicingPddInfoEntity.getDqkcsl()+"")){
return Result.error("参数错误，请填写库存数量");
}
if(invoicingPddInfoEntity.getPdsl() ==null){
return Result.error("参数错误，请填写盘点数量");
}
Map<String,Object> result = pddApi.editPddInfo(invoicingPddInfoEntity);
if ((boolean)result.get("success")){
// Map<String,Object> map = new HashMap<>();
// map.put("message","操作成功");
// map.put("data",result.get("message"));
return Result.OK(result.get("message"));
}else{
return Result.error(result.get("message").toString());
}
}
@ApiOperation(value="盘点单-提交盘点信息", notes="盘点单-提交盘点信息")
@AutoLog(value = "盘点单-提交盘点信息",clientType="app", operateType = 2)
@PostMapping(value = "/submitPddMain")
public Result<Object> submitPddMain(@RequestBody InvoicingPddMainEntity invoicingPddMainEntity) {
if(StringUtils.isBlank(invoicingPddMainEntity.getId())){
return Result.error("参数错误，请选择盘点单");
}
Map<String,Object> result = pddApi.submitPddMain(invoicingPddMainEntity);
if ((boolean)result.get("success")){
return Result.OK(result.get("message"));
}else{
return Result.error(result.get("message").toString());
}
}
@ApiOperation(value = "盘点单-查询盘点人列表", notes = "盘点单-查询盘点人列表")
@GetMapping(value = "/queryPddStartByList")
public Result<List<Map<String,String>>> queryPddStartByList(InvoicingPddInfoEntity invoicingPddInfoEntity) {
if(StringUtils.isBlank(invoicingPddInfoEntity.getNuId())){
return Result.error("参数错误，请选择库房");
}
List<Map<String,String>> pageList = pddApi.queryPddStartByList(invoicingPddInfoEntity);
return Result.OK(pageList);
}
@ApiOperation(value="盘点单-作废盘点单", notes="盘点单-作废盘点单")
@AutoLog(value = "盘点单-作废盘点单",clientType="app", operateType = 2)
@PostMapping(value = "/voidedPddMain")
public Result<Object> voidedPddMain(@RequestBody InvoicingPddMainEntity invoicingPddMainEntity) {
if(StringUtils.isBlank(invoicingPddMainEntity.getId())){
return Result.error("参数错误，请选择盘点单");
}
Map<String,Object> result = pddApi.voidedPddMain(invoicingPddMainEntity);
if ((boolean)result.get("success")){
return Result.OK(result.get("message"));
}else{
return Result.error(result.get("message").toString());
}
}
@ApiOperation(value = "盘点单-查询是否有盘点中的单据", notes = "盘点单-查询是否有盘点中的单据")
@GetMapping(value = "/queryPddStartInfo")
public Result<Map<String, Object>> queryPddStartInfo(InvoicingPddInfoEntity invoicingPddInfoEntity) {
Map<String, Object> pageList = pddApi.queryPddStartInfo(invoicingPddInfoEntity);
return Result.OK(pageList);
}
// /**
// * 盘点单-服务指令-开始服务
// *
// * @param dto
// * @return
// */
// @ApiOperation(value = "盘点单-服务指令-开始服务", notes = "盘点单-服务指令-开始服务")
// @AutoLog(value = "盘点单-服务指令-开始服务", clientType = "app")
// @PostMapping(value = "/startDirectiveServe")
// public Result<?> startDirectiveServe(@RequestBody InvoicingPddInfoEntity dto) {
// if (StringUtils.isBlank(dto.getId())) {
// return Result.error("缺少参数");
// }
// Map<String, Object> result = pddApi.startDirectiveServe(dto);
// if ((boolean)result.get("success")) {
// return Result.OK(result.get("message"));
// } else {
// return Result.error(result.get("message").toString());
// }
// }
// /**
// * 盘点单-服务指令-结束服务
// *
// * @param dto
// * @return
// */
// @ApiOperation(value = "盘点单-服务指令-结束服务", notes = "盘点单-服务指令-结束服务")
// @AutoLog(value = "盘点单-服务指令-结束服务", clientType = "app")
// @PostMapping(value = "/finishDirectiveServe")
// public Result<?> finishDirectiveServe(@RequestBody InvoicingPddInfoEntity dto) {
// if (StringUtils.isBlank(dto.getId())) {
// return Result.error("缺少参数");
// }
// Map<String, Object> result = pddApi.finishDirectiveServe(dto);
// if ((boolean)result.get("success")) {
// return Result.OK(result.get("message"));
// } else {
// return Result.error(result.get("message").toString());
// }
// }
}

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

@ -3,7 +3,6 @@ package com.nu.modules.pad.invoicing.api;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.collect.Maps;
import com.nu.entity.*;
import com.nu.modules.invoicing.api.IPddApi;
import com.nu.modules.invoicing.api.IQinglingApi;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
@ -26,8 +25,6 @@ public class InvoicingQldApi {
@Autowired
private IQinglingApi qinglingApi;
//盘点单
@Autowired
private IPddApi pddApi;
/**
* 物料树查询（库房中已有物料）
@ -268,11 +265,6 @@ public class InvoicingQldApi {
if (StringUtils.isBlank(dto.getNuId()) || StringUtils.isBlank(dto.getElderId())) {
return Result.error("缺少参数");
}
//判断库房是否正在盘点中
Map<String, Object> pdResult = pddApi.queryPddStartInfo(null);
if (!(boolean)pdResult.get("success")) {
return Result.error(pdResult.get("message").toString());
}
Map<String, Object> result = qinglingApi.submitQld(dto);
if ((boolean)result.get("success")) {
return Result.OK(result.get("message"));
@ -369,11 +361,6 @@ public class InvoicingQldApi {
if (StringUtils.isBlank(dto.getQldNo()) || StringUtils.isBlank(dto.getNuId()) || StringUtils.isBlank(dto.getElderId())) {
return Result.error("缺少参数");
}
//库房是否正在盘点中
Map<String, Object> pdResult = pddApi.queryPddStartInfo(null);
if (!(boolean) pdResult.get("success")) {
return Result.error(pdResult.get("message").toString());
}
Map<String, Object> result = qinglingApi.confirmReceipt(dto);
if ((boolean)result.get("success")) {
Map<String, Object> r_ = Maps.newHashMap();
@ -426,11 +413,6 @@ public class InvoicingQldApi {
if (dto.getQldNo().indexOf(",") > 0) {
return Result.error("出库失败");
}
//判断库房是否正在盘点中
Map<String, Object> pdResult = pddApi.queryPddStartInfo(null);
if (!(boolean)pdResult.get("success")) {
return Result.error(pdResult.get("message").toString());
}
Map<String, Object> result = qinglingApi.outbound(dto);
if ((boolean)result.get("success")) {
return Result.ok(result);

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

@ -1,11 +1,9 @@
package com.nu.modules.pad.invoicing.api;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.collect.Maps;
import com.nu.entity.InvoicingThdGwcEntity;
import com.nu.entity.InvoicingThdMainEntity;
import com.nu.entity.NuKcslEntity;
import com.nu.modules.invoicing.api.IPddApi;
import com.nu.modules.invoicing.api.ITuiHuoApi;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils;
@ -27,8 +25,6 @@ public class InvoicingThdApi {
@Autowired
private ITuiHuoApi tuiHuoApi;
//盘点单
@Autowired
private IPddApi pddApi;
/**
* 查询退货单
@ -197,11 +193,6 @@ public class InvoicingThdApi {
@AutoLog(value = "退货单-入库退货单", clientType = "app")
@PostMapping(value = "/submitThd")
public Result<?> submitThd(@RequestBody InvoicingThdMainEntity dto) {
//库房是否正在盘点中
Map<String, Object> izPd = pddApi.queryPddStartInfo(null);
if (!(boolean) izPd.get("success")) {
return Result.error(izPd.get("message").toString());
}
if (StringUtils.isBlank(dto.getId())) {
return Result.error("缺少参数");
}

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

@ -92,8 +92,6 @@ public interface IInvoicingApi {
Map<String, Object> queryCrkInfoNumList(Integer pageNo, Integer pageSize, WarehouseMaterialCrkInfoEntity crkInfoEntity, HttpServletRequest req);
Map<String, Object> queryPddStartInfo(Object o);
IPage<CgdMainEntity> getCgdListByGysId(Integer pageNo, Integer pageSize, CgdMainEntity cgdMainEntityDto, HttpServletRequest req);
Map<String, Object> getCgdInfoByCgdId(CgdMainEntity cgdMainEntityDto);

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

@ -1,31 +0,0 @@
package com.nu.modules.invoicing.api;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.nu.entity.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
public interface IPddApi {
IPage<InvoicingPddMainEntity> queryPddList(Integer pageNo, Integer pageSize, InvoicingPddMainEntity invoicingPddMainEntity, HttpServletRequest req);
Map<String,Object> addPddMain(InvoicingPddMainEntity invoicingPddMainEntity);
IPage<InvoicingPddInfoEntity> queryPddInfoList(Integer pageNo, Integer pageSize, InvoicingPddInfoEntity invoicingPddInfoEntity, HttpServletRequest req);
Map<String, Object> editPddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity);
Map<String, Object> submitPddMain(InvoicingPddMainEntity invoicingPddMainEntity);
List<Map<String,String>> queryPddStartByList(InvoicingPddInfoEntity invoicingPddInfoEntity);
Map<String, Object> voidedPddMain(InvoicingPddMainEntity invoicingPddMainEntity);
Map<String, Object> queryPddStartInfo(InvoicingPddInfoEntity invoicingPddInfoEntity);
// Map<String, Object> startDirectiveServe(InvoicingPddInfoEntity invoicingPddInfoEntity);
// Map<String, Object> finishDirectiveServe(InvoicingPddInfoEntity invoicingPddInfoEntity);
}

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

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.dto.CgdBeanDto;
import com.nu.dto.CgdInfoDto;
import com.nu.dto.CgdMainDto;
@ -25,7 +26,6 @@ import com.nu.modules.cgd.service.INuInvoicingCgdMainService;
import com.nu.modules.configSuppliersInfo.entity.ConfigSuppliersInfo;
import com.nu.modules.configSuppliersInfo.mapper.ConfigSuppliersInfoMapper;
import com.nu.modules.invoicing.api.IInvoicingApi;
import com.nu.modules.invoicing.api.IPddApi;
import com.nu.modules.nubaseinfo.entity.NuBaseInfo;
import com.nu.modules.nubaseinfo.mapper.NuBaseInfoMapper;
import com.nu.modules.order.api.IDirectiveOrderApi;
@ -38,11 +38,9 @@ import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo;
import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper;
import com.nu.utils.DictUtils;
import com.nu.utils.RabbitMQUtil;
import io.swagger.models.auth.In;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
@ -53,8 +51,6 @@ import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
@ -115,8 +111,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
@Autowired
private DictUtils dictUtils;
@Autowired
private IPddApi pddApi;
@Autowired
@ -1469,10 +1463,6 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
return map;
}
@Override
public Map<String, Object> queryPddStartInfo(Object o) {
return pddApi.queryPddStartInfo(null);
}
@Override
public IPage<CgdMainEntity> getCgdListByGysId(Integer pageNo, Integer pageSize, CgdMainEntity cgdMainEntityDto, HttpServletRequest req) {

180
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/controller/NuInvoicingPddMainController.java
View File

@ -1,180 +0,0 @@
package com.nu.modules.pdd.controller;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.util.oConvertUtils;
import com.nu.modules.pdd.entity.NuInvoicingPddMain;
import com.nu.modules.pdd.service.INuInvoicingPddMainService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.apache.shiro.authz.annotation.RequiresPermissions;
/**
* @Description: 进销存-盘点单主表
* @Author: jeecg-boot
* @Date: 2025-12-10
* @Version: V1.0
*/
@Api(tags="进销存-盘点单主表")
@RestController
@RequestMapping("/pdd/nuInvoicingPddMain")
@Slf4j
public class NuInvoicingPddMainController extends JeecgController<NuInvoicingPddMain, INuInvoicingPddMainService> {
@Autowired
private INuInvoicingPddMainService nuInvoicingPddMainService;
/**
* 分页列表查询
*
* @param nuInvoicingPddMain
* @param pageNo
* @param pageSize
* @param req
* @return
*/
//@AutoLog(value = "进销存-盘点单主表-分页列表查询")
@ApiOperation(value="进销存-盘点单主表-分页列表查询", notes="进销存-盘点单主表-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<NuInvoicingPddMain>> queryPageList(NuInvoicingPddMain nuInvoicingPddMain,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<NuInvoicingPddMain> queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingPddMain, req.getParameterMap());
Page<NuInvoicingPddMain> page = new Page<NuInvoicingPddMain>(pageNo, pageSize);
IPage<NuInvoicingPddMain> pageList = nuInvoicingPddMainService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param nuInvoicingPddMain
* @return
*/
@AutoLog(value = "进销存-盘点单主表-添加")
@ApiOperation(value="进销存-盘点单主表-添加", notes="进销存-盘点单主表-添加")
@RequiresPermissions("pdd:nu_invoicing_pdd_main:add")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody NuInvoicingPddMain nuInvoicingPddMain) {
nuInvoicingPddMainService.save(nuInvoicingPddMain);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param nuInvoicingPddMain
* @return
*/
@AutoLog(value = "进销存-盘点单主表-编辑")
@ApiOperation(value="进销存-盘点单主表-编辑", notes="进销存-盘点单主表-编辑")
@RequiresPermissions("pdd:nu_invoicing_pdd_main:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody NuInvoicingPddMain nuInvoicingPddMain) {
nuInvoicingPddMainService.updateById(nuInvoicingPddMain);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
* @param id
* @return
*/
@AutoLog(value = "进销存-盘点单主表-通过id删除")
@ApiOperation(value="进销存-盘点单主表-通过id删除", notes="进销存-盘点单主表-通过id删除")
@RequiresPermissions("pdd:nu_invoicing_pdd_main:delete")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
nuInvoicingPddMainService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
* @param ids
* @return
*/
@AutoLog(value = "进销存-盘点单主表-批量删除")
@ApiOperation(value="进销存-盘点单主表-批量删除", notes="进销存-盘点单主表-批量删除")
@RequiresPermissions("pdd:nu_invoicing_pdd_main:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.nuInvoicingPddMainService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
* @param id
* @return
*/
//@AutoLog(value = "进销存-盘点单主表-通过id查询")
@ApiOperation(value="进销存-盘点单主表-通过id查询", notes="进销存-盘点单主表-通过id查询")
@GetMapping(value = "/queryById")
public Result<NuInvoicingPddMain> queryById(@RequestParam(name="id",required=true) String id) {
NuInvoicingPddMain nuInvoicingPddMain = nuInvoicingPddMainService.getById(id);
if(nuInvoicingPddMain==null) {
return Result.error("未找到对应数据");
}
return Result.OK(nuInvoicingPddMain);
}
/**
* 导出excel
*
* @param request
* @param nuInvoicingPddMain
*/
@RequiresPermissions("pdd:nu_invoicing_pdd_main:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, NuInvoicingPddMain nuInvoicingPddMain) {
return super.exportXls(request, nuInvoicingPddMain, NuInvoicingPddMain.class, "进销存-盘点单主表");
}
/**
* 通过excel导入数据
*
* @param request
* @param response
* @return
*/
@RequiresPermissions("pdd:nu_invoicing_pdd_main:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, NuInvoicingPddMain.class);
}
}

111
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/entity/NuInvoicingPddMain.java
View File

@ -1,111 +0,0 @@
package com.nu.modules.pdd.entity;
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 org.jeecg.common.constant.ProvinceCityArea;
import org.jeecg.common.util.SpringContextUtils;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 进销存-盘点单主表
* @Author: jeecg-boot
* @Date: 2025-12-10
* @Version: V1.0
*/
@Data
@TableName("nu_invoicing_pdd_main")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="nu_invoicing_pdd_main对象", description="进销存-盘点单主表")
public class NuInvoicingPddMain implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.String id;
/**createBy*/
@ApiModelProperty(value = "createBy")
private java.lang.String createBy;
/**createTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "createTime")
private java.util.Date createTime;
/**updateBy*/
@ApiModelProperty(value = "updateBy")
private java.lang.String updateBy;
/**updateTime*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "updateTime")
private java.util.Date updateTime;
/**盘点单单号*/
@Excel(name = "盘点单单号", width = 15)
@ApiModelProperty(value = "盘点单单号")
private java.lang.String pddNo;
/**盘点单类型 1盘点中 2已完成 3作废*/
@Excel(name = "盘点单类型 1盘点中 2已完成 3作废", width = 15, dicCode = "pdd_type")
@Dict(dicCode = "pdd_type")
@ApiModelProperty(value = "盘点单类型 1盘点中 2已完成 3作废")
private java.lang.String pddType;
/**盘点单状态 1盘点中 2盘点结束 3作废*/
@Excel(name = "盘点单状态 1盘点中 2盘点结束 3作废", width = 15, dicCode = "pdd_status")
@Dict(dicCode = "pdd_status")
@ApiModelProperty(value = "盘点单状态 1盘点中 2盘点结束 3作废")
private java.lang.String pddStatus;
/**盘点单发起人*/
@Excel(name = "盘点单发起人", width = 15)
@ApiModelProperty(value = "盘点单发起人")
private java.lang.String pddStartBy;
/**盘点单发起时间*/
@Excel(name = "盘点单发起时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "盘点单发起时间")
private java.util.Date pddStartTime;
/**盘点单完成人*/
@Excel(name = "盘点单完成人", width = 15)
@ApiModelProperty(value = "盘点单完成人")
private java.lang.String pddEndBy;
/**盘点单完成时间*/
@Excel(name = "盘点单完成时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "盘点单完成时间")
private java.util.Date pddEndTime;
/**对应库房*/
@Excel(name = "对应库房", width = 15)
@ApiModelProperty(value = "对应库房")
private java.lang.String nuId;
/**库房名称*/
@Excel(name = "库房名称", width = 15)
@ApiModelProperty(value = "库房名称")
private java.lang.String nuName;
/**盘盈单数量 0是没有 其他是具体数字*/
@Excel(name = "盘盈单数量 0是没有 其他是具体数字", width = 15)
@ApiModelProperty(value = "盘盈单数量 0是没有 其他是具体数字")
private java.lang.Integer pydNum;
/**盘亏单数量 0是没有 其他是具体数字*/
@Excel(name = "盘亏单数量 0是没有 其他是具体数字", width = 15)
@ApiModelProperty(value = "盘亏单数量 0是没有 其他是具体数字")
private java.lang.Integer pkdNum;
/**服务指令id （预留字段）*/
@Excel(name = "服务指令id （预留字段）", width = 15)
@ApiModelProperty(value = "服务指令id （预留字段）")
private java.lang.String serverId;
}

11
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddInfoMapper.java
View File

@ -1,12 +1,10 @@
package com.nu.modules.pdd.mapper;
import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nu.entity.InvoicingPddInfoEntity;
import com.nu.entity.MaterialInfoEntity;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.pdd.entity.NuInvoicingPddInfo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* @Description: 进销存-盘点单物料详细信息
@ -16,11 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface NuInvoicingPddInfoMapper extends BaseMapper<NuInvoicingPddInfo> {
void addPddInfo(@Param("nuId") String nuId,@Param("createBy") String createBy,@Param("pddId") String pddId);
List<NuInvoicingPddInfo> selectPydPkdList(@Param("pddId")String pddId);
List<NuInvoicingPddInfo> queryPddStartByList(@Param("params") InvoicingPddInfoEntity invoicingPddInfoEntity);
InvoicingPddInfoEntity getPddInfoById(@Param("params") InvoicingPddInfoEntity invoicingPddInfoEntity);

18
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/NuInvoicingPddMainMapper.java
View File

@ -1,18 +0,0 @@
package com.nu.modules.pdd.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.nu.modules.pdd.entity.NuInvoicingPddMain;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 进销存-盘点单主表
* @Author: jeecg-boot
* @Date: 2025-12-10
* @Version: V1.0
*/
public interface NuInvoicingPddMainMapper extends BaseMapper<NuInvoicingPddMain> {
List<NuInvoicingPddMain> selectPddWlsfzyList(@Param("wlId") String wlId);
}

29
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddInfoMapper.xml
View File

@ -2,36 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.pdd.mapper.NuInvoicingPddInfoMapper">
<insert id="addPddInfo">
INSERT INTO nu_invoicing_pdd_info (
id, create_by, create_time, pdd_id, nu_id, wl_id,
dqkcsl, pdsl, cesl, pd_type, content, pic_path,
category_name, type_name, medication_name, material_name,
material_no, specification_model, material_img, material_units
)
SELECT
CONCAT(UUID_SHORT(), LPAD(FLOOR(RAND() * 1000000), 6, '0')) as id,
#{createBy} as create_by,
NOW() as create_time,
#{pddId} as pdd_id,
a.nu_id,b.id as wl_id,a.kcsl as dqkcsl,
null as pdsl,null as cesl,null as pd_type,null as content,null as pic_path,
c.category_name as category_name,d.type_name as type_name,e.medication_name as medication_name,
b.material_name,b.material_no,b.specification_model,b.material_img,b.material_units
FROM nu_warehouse_material_info a
LEFT JOIN nu_config_material_info b ON a.wl_id = b.id
left join nu_config_material_category c on b.category_id = c.id
left join nu_config_material_type d on b.type_id = d.id
left join nu_config_material_medication e on b.medication_id = e.id
WHERE a.nu_id = #{nuId} AND a.iz_enabled = 'Y'
</insert>
<select id="selectPydPkdList" resultType="com.nu.modules.pdd.entity.NuInvoicingPddInfo">
select pd_type,count(*) as num from nu_invoicing_pdd_info where pdd_id = #{pddId} GROUP BY pd_type
</select>
<select id="queryPddStartByList" resultType="com.nu.modules.pdd.entity.NuInvoicingPddInfo">
select pdd_start_by as create_by from nu_invoicing_pdd_main where nu_id = #{params.nuId} GROUP BY pdd_start_by
</select>
<select id="getPddInfoById" resultType="com.nu.entity.InvoicingPddInfoEntity">

10
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/mapper/xml/NuInvoicingPddMainMapper.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.nu.modules.pdd.mapper.NuInvoicingPddMainMapper">
<select id="selectPddWlsfzyList" resultType="com.nu.modules.pdd.entity.NuInvoicingPddMain">
select a.* from nu_invoicing_pdd_main a
INNER JOIN nu_invoicing_pdd_info b on a.id = b.pdd_id
where a.pdd_type = '1' and b.wl_id = #{wlId}
</select>
</mapper>

14
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/INuInvoicingPddMainService.java
View File

@ -1,14 +0,0 @@
package com.nu.modules.pdd.service;
import com.nu.modules.pdd.entity.NuInvoicingPddMain;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 进销存-盘点单主表
* @Author: jeecg-boot
* @Date: 2025-12-10
* @Version: V1.0
*/
public interface INuInvoicingPddMainService extends IService<NuInvoicingPddMain> {
}

411
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/pdd/service/impl/NuInvoicingPddMainServiceImpl.java
View File

@ -1,411 +0,0 @@
package com.nu.modules.pdd.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nu.entity.*;
import com.nu.modules.cgd.entity.NuWarehouseMaterialCrkInfo;
import com.nu.modules.cgd.mapper.NuWarehouseMaterialCrkInfoMapper;
import com.nu.modules.invoicing.api.*;
import com.nu.modules.nubaseinfo.entity.NuBaseInfo;
import com.nu.modules.nubaseinfo.mapper.NuBaseInfoMapper;
import com.nu.modules.order.api.IDirectiveOrderApi;
import com.nu.modules.pdd.entity.NuInvoicingPddInfo;
import com.nu.modules.pdd.entity.NuInvoicingPddMain;
import com.nu.modules.pdd.mapper.NuInvoicingPddInfoMapper;
import com.nu.modules.pdd.mapper.NuInvoicingPddMainMapper;
import com.nu.modules.pdd.service.INuInvoicingPddMainService;
import com.nu.modules.warehouseMaterialInfo.entity.BlWarehouseMaterialInfo;
import com.nu.modules.warehouseMaterialInfo.mapper.BlWarehouseMaterialInfoMapper;
import com.nu.utils.DictUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.RedisUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
/**
* @Description: 进销存-盘点单主表
* @Author: jeecg-boot
* @Date: 2025-12-10
* @Version: V1.0
*/
@Service
public class NuInvoicingPddMainServiceImpl extends ServiceImpl<NuInvoicingPddMainMapper, NuInvoicingPddMain> implements INuInvoicingPddMainService, IPddApi {
@Autowired
private RedisUtil redisUtil;
@Autowired
private NuBaseInfoMapper nuBaseInfoMapper;
@Autowired
private NuInvoicingPddInfoMapper pddInfoMapper;
@Autowired
private NuWarehouseMaterialCrkInfoMapper crkInfoMapper;
@Autowired
private BlWarehouseMaterialInfoMapper mterialInfoMapper;
@Autowired
private DictUtils dictUtils;
@Autowired
private IDirectiveOrderApi directiveOrderApi;
@Override
public IPage<InvoicingPddMainEntity> queryPddList(Integer pageNo, Integer pageSize, InvoicingPddMainEntity invoicingPddMainEntity, HttpServletRequest req) {
NuInvoicingPddMain nuInvoicingPddMain = new NuInvoicingPddMain();
BeanUtils.copyProperties(invoicingPddMainEntity,nuInvoicingPddMain);
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
QueryWrapper<NuInvoicingPddMain> queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingPddMain, req.getParameterMap(), customeRuleMap);
queryWrapper.ge(StringUtils.isNotEmpty(invoicingPddMainEntity.getStartTime()),"create_time",invoicingPddMainEntity.getStartTime());
queryWrapper.le(StringUtils.isNotEmpty(invoicingPddMainEntity.getEndTime()),"create_time",invoicingPddMainEntity.getEndTime());
queryWrapper.orderByDesc("create_time");
if(StringUtils.isNotBlank(invoicingPddMainEntity.getPddInfo())){
queryWrapper.apply("(pdd_no like '%"+invoicingPddMainEntity.getPddInfo()+"%' or pdd_start_by like '%"+invoicingPddMainEntity.getPddInfo()+"%')" );
}
if(StringUtils.equals("1",invoicingPddMainEntity.getPydOrPkd())){
queryWrapper.gt("pyd_num",0);
}else if (StringUtils.equals("2",invoicingPddMainEntity.getPydOrPkd())){
queryWrapper.gt("pkd_num",0);
}else if (StringUtils.equals("1,2",invoicingPddMainEntity.getPydOrPkd())){
queryWrapper.gt("pyd_num",0);
queryWrapper.gt("pkd_num",0);
}
Page<NuInvoicingPddMain> page = new Page<>(pageNo, pageSize);
List<NuInvoicingPddMain> list = baseMapper.selectList(page,queryWrapper);
IPage<InvoicingPddMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
entityPage.setRecords(BeanUtil.copyToList(list, InvoicingPddMainEntity.class));
return entityPage;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Map<String,Object> addPddMain(InvoicingPddMainEntity invoicingPddMainEntity) {
Map<String,Object> map = new HashMap<>();
List<NuInvoicingPddMain> list = baseMapper.selectList(new QueryWrapper<NuInvoicingPddMain>().eq("nu_id",invoicingPddMainEntity.getNuId()).eq("pdd_type","1"));
if(list.size() > 0){
map.put("success",false);
map.put("message","盘点单已存在,不可重复创建");
return map;
}
String qgdDate = new SimpleDateFormat("yyyyMMdd").format(new Date());
String qgdXlh = "";
if(redisUtil.get("pdd"+qgdDate) != null){
qgdXlh = redisUtil.get("pdd"+qgdDate).toString();
}
int qgdXlhInt = 0;
if(StringUtils.isNotBlank(qgdXlh)){
qgdXlhInt = Integer.parseInt(qgdXlh);
}
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(user == null || StringUtils.isBlank(user.getRealname())){
user = new LoginUser();
user.setRealname("系统");
user.setOrgCode("101");
}
NuInvoicingPddMain newNuInvoicingPddMain = new NuInvoicingPddMain();
BeanUtils.copyProperties(invoicingPddMainEntity,newNuInvoicingPddMain);
String pddNo = "P"+user.getOrgCode()+qgdDate+String.format("%03d", ++qgdXlhInt);
newNuInvoicingPddMain.setPddNo(pddNo);
newNuInvoicingPddMain.setPddStartBy(user.getRealname());
newNuInvoicingPddMain.setPddStartTime(new Date());
newNuInvoicingPddMain.setPddType("1");
newNuInvoicingPddMain.setPddStatus("1");
NuBaseInfo nuBaseInfo = nuBaseInfoMapper.selectOne(new QueryWrapper<NuBaseInfo>().eq("nu_id",newNuInvoicingPddMain.getNuId()));
newNuInvoicingPddMain.setNuName(nuBaseInfo.getNuName());
baseMapper.insert(newNuInvoicingPddMain);
BeanUtils.copyProperties(newNuInvoicingPddMain,invoicingPddMainEntity);
//添加盘点信息-根据库房id自动添加
pddInfoMapper.addPddInfo(newNuInvoicingPddMain.getNuId(),user.getRealname(),newNuInvoicingPddMain.getId());
redisUtil.set("pdd"+qgdDate,qgdXlhInt);
invoicingPddMainEntity.setPddType_dictText("盘点中");
map.put("success",true);
map.put("message",invoicingPddMainEntity);
DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
qgdInfoEntityDto.setBizTypeCode("PDD");// 业务类型编码（如：ql）
qgdInfoEntityDto.setBizType("盘点单");// 业务类型名称（如：请领）
qgdInfoEntityDto.setBizNo(pddNo);//业务主表单号（如：Q10120260109001）
qgdInfoEntityDto.setOptType("新增");//操作类型（如：提交）
directiveOrderApi.addBizLog(qgdInfoEntityDto);
return map;
}
@Override
public IPage<InvoicingPddInfoEntity> queryPddInfoList(Integer pageNo, Integer pageSize, InvoicingPddInfoEntity invoicingPddInfoEntity, HttpServletRequest req) {
NuInvoicingPddInfo nuInvoicingPddInfo = new NuInvoicingPddInfo();
BeanUtils.copyProperties(invoicingPddInfoEntity,nuInvoicingPddInfo);
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
QueryWrapper<NuInvoicingPddInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuInvoicingPddInfo, req.getParameterMap(), customeRuleMap);
if(StringUtils.equals("1",invoicingPddInfoEntity.getParamType())){
queryWrapper.eq("pd_type","1");
}else if (StringUtils.equals("2",invoicingPddInfoEntity.getParamType())){
queryWrapper.eq("pd_type","2");
}else if (StringUtils.equals("3",invoicingPddInfoEntity.getParamType())){
queryWrapper.gt("pdsl",0);
}else if (StringUtils.equals("4",invoicingPddInfoEntity.getParamType())){
queryWrapper.isNull("pdsl");
}
Page<NuInvoicingPddInfo> page = new Page<>(pageNo, pageSize);
List<NuInvoicingPddInfo> list = pddInfoMapper.selectList(page,queryWrapper);
IPage<InvoicingPddInfoEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
entityPage.setRecords(BeanUtil.copyToList(list, InvoicingPddInfoEntity.class));
return entityPage;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> editPddInfo(InvoicingPddInfoEntity invoicingPddInfoEntity) {
Map<String,Object> map = new HashMap<>();
NuInvoicingPddInfo nuInvoicingPddInfo = new NuInvoicingPddInfo();
BeanUtils.copyProperties(invoicingPddInfoEntity,nuInvoicingPddInfo);
Double kcsl = nuInvoicingPddInfo.getDqkcsl();
Double pdsl = nuInvoicingPddInfo.getPdsl();
if(pdsl > kcsl){
nuInvoicingPddInfo.setPdType("1");
}else if(pdsl < kcsl){
nuInvoicingPddInfo.setPdType("2");
}
nuInvoicingPddInfo.setCesl(Math.abs(pdsl-kcsl));
pddInfoMapper.updateById(nuInvoicingPddInfo);
nuInvoicingPddInfo = pddInfoMapper.selectById(nuInvoicingPddInfo);
//修改盘盈单盘亏单数量
List<NuInvoicingPddInfo> list = pddInfoMapper.selectPydPkdList(nuInvoicingPddInfo.getPddId());
Integer pydNum = 0;
Integer pkdNum = 0;
for(NuInvoicingPddInfo param : list){
if (StringUtils.equals("1",param.getPdType())){
pydNum += param.getNum();
}else if (StringUtils.equals("2",param.getPdType())){
pkdNum += param.getNum();
}
}
NuInvoicingPddMain nuInvoicingPddMain = new NuInvoicingPddMain();
nuInvoicingPddMain.setId(nuInvoicingPddInfo.getPddId());
nuInvoicingPddMain.setPydNum(pydNum);
nuInvoicingPddMain.setPkdNum(pkdNum);
baseMapper.updateById(nuInvoicingPddMain);
map.put("success",true);
map.put("message",nuInvoicingPddInfo);
return map;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> submitPddMain(InvoicingPddMainEntity invoicingPddMainEntity) {
Map<String,Object> map = new HashMap<>();
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(user == null || StringUtils.isBlank(user.getRealname())){
user = new LoginUser();
user.setRealname("系统");
}
NuInvoicingPddMain nuInvoicingPddMainInfo =baseMapper.selectById(invoicingPddMainEntity.getId());
if(!StringUtils.equals("1",nuInvoicingPddMainInfo.getPddType())){
map.put("success",false);
map.put("message","盘点单状态不是盘点中，不能提交盘点单");
return map;
}
List<NuInvoicingPddInfo> list = pddInfoMapper.selectList(new QueryWrapper<NuInvoicingPddInfo>().eq("pdd_id",invoicingPddMainEntity.getId()).isNull("pdsl"));
int sfwc = 0;//是否完成
for(NuInvoicingPddInfo param : list){
if (StringUtils.isBlank(param.getPdType())){
sfwc = 1;
break;
}
}
if(sfwc == 1){
map.put("success",false);
map.put("message","有未完成的盘点信息，不能提交盘点单");
return map;
}
NuInvoicingPddMain nuInvoicingPddMain = new NuInvoicingPddMain();
BeanUtils.copyProperties(invoicingPddMainEntity,nuInvoicingPddMain);
nuInvoicingPddMain.setPddEndBy(user.getRealname());
nuInvoicingPddMain.setPddEndTime(new Date());
nuInvoicingPddMain.setPddType("2");
nuInvoicingPddMain.setPddStatus("2");
baseMapper.updateById(nuInvoicingPddMain);
List<NuInvoicingPddInfo> listCrk = pddInfoMapper.selectList(new QueryWrapper<NuInvoicingPddInfo>().eq("pdd_id",invoicingPddMainEntity.getId()).gt("cesl",0));
for(NuInvoicingPddInfo param : listCrk){
//库存信息
List<BlWarehouseMaterialInfo> mterialInfoList = mterialInfoMapper.selectList(new QueryWrapper<BlWarehouseMaterialInfo>().eq("wl_id",param.getWlId()).eq("nu_id",param.getNuId()));
if(mterialInfoList == null || mterialInfoList.size() == 0){
continue;
}
BlWarehouseMaterialInfo mterialInfo = mterialInfoList.get(0);
Double kcsl = mterialInfo.getKcsl();
Double dqkcl = mterialInfo.getKcsl();
NuWarehouseMaterialCrkInfo crkInfo = new NuWarehouseMaterialCrkInfo();
crkInfo.setCreateBy(user.getRealname());
crkInfo.setCgdId(param.getPddId());
crkInfo.setNuId(param.getNuId());
crkInfo.setWlId(param.getWlId());
crkInfo.setCrkNum(param.getCesl());//出入库数量
if(StringUtils.equals("1",param.getPdType())){//盘盈单
crkInfo.setCrkStatus("1");//入库
dqkcl = Double.parseDouble(BigDecimal.valueOf(dqkcl).add(BigDecimal.valueOf(param.getCesl())).toString());
}else if(StringUtils.equals("2",param.getPdType())){//盘亏单
crkInfo.setCrkStatus("3");//出库
dqkcl = Double.parseDouble(BigDecimal.valueOf(dqkcl).subtract(BigDecimal.valueOf(param.getCesl())).toString());
}else{//其他的不进行操作
continue;
}
crkInfo.setCrkType("4");//固定是盘点单
// crkInfo.setOldPrice(mterialInfo.getSalesUnitPrice());//原来的价格（最开始的采购价格）
// crkInfo.setNewPrice(price);//新的价格
crkInfo.setCzqkcl(kcsl);//操作前库存量
crkInfo.setDqkcl(dqkcl);//当前库存量
// crkInfo.setDdwNum(1);//多单位时的数量
crkInfo.setContent("盘点单："+nuInvoicingPddMainInfo.getPddNo());
crkInfo.setMaterialCategoryName(dictUtils.translateDictValue("id","category_name","nu_config_material_category",mterialInfo.getCategoryId()));//物料类别名称
crkInfo.setMaterialTypeName(dictUtils.translateDictValue("id","type_name","nu_config_material_type",mterialInfo.getTypeId()));//物料类型名称
crkInfo.setMaterialMedicationName(dictUtils.translateDictValue("id","medication_name","nu_config_material_medication",mterialInfo.getMedicationId()));//物料类型名称
crkInfo.setMaterialName(mterialInfo.getMaterialName());//物料名称
crkInfo.setMaterialUnits(mterialInfo.getMaterialUnits());//物料单位
crkInfo.setMaterialNo(mterialInfo.getMaterialNo());//物料编码
crkInfo.setSpecificationModel(mterialInfo.getSpecificationModel());//规格型号
crkInfo.setMaterialImg(mterialInfo.getMaterialImg());//物料图片
crkInfo.setSalesUnitPrice(new BigDecimal(mterialInfo.getSalesUnitPrice()));//销售单价
if(crkInfo.getCrkNum()>0){
crkInfoMapper.insert(crkInfo);
mterialInfo.setKcsl(dqkcl);
mterialInfoMapper.updateById(mterialInfo);
}
}
map.put("success",true);
map.put("message","操作成功");
DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
qgdInfoEntityDto.setBizTypeCode("PDD");// 业务类型编码（如：ql）
qgdInfoEntityDto.setBizType("盘点单");// 业务类型名称（如：请领）
qgdInfoEntityDto.setBizNo(nuInvoicingPddMainInfo.getPddNo());//业务主表单号（如：Q10120260109001）
qgdInfoEntityDto.setOptType("盘点完成");//操作类型（如：提交）
directiveOrderApi.addBizLog(qgdInfoEntityDto);
return map;
}
@Override
public List<Map<String,String>> queryPddStartByList(InvoicingPddInfoEntity invoicingPddInfoEntity) {
List<NuInvoicingPddInfo> list = pddInfoMapper.queryPddStartByList(invoicingPddInfoEntity);
List<Map<String,String>> list1 = new ArrayList<>();
for(NuInvoicingPddInfo param : list){
Map<String,String> map = new HashMap<>();
map.put("name",param.getCreateBy());
list1.add(map);
}
return list1;
}
@Override
public Map<String, Object> voidedPddMain(InvoicingPddMainEntity invoicingPddMainEntity) {
Map<String,Object> map = new HashMap<>();
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(user == null || StringUtils.isBlank(user.getRealname())){
user = new LoginUser();
user.setRealname("系统");
}
NuInvoicingPddMain nuInvoicingPddMainInfo =baseMapper.selectById(invoicingPddMainEntity.getId());
if(!StringUtils.equals("1",nuInvoicingPddMainInfo.getPddType())){
map.put("success",false);
map.put("message","盘点单状态不是盘点中，不能作废盘点单");
return map;
}
// List<NuInvoicingPddInfo> listCrk = pddInfoMapper.selectList(new QueryWrapper<NuInvoicingPddInfo>().eq("pdd_id",invoicingPddMainEntity.getId()));
// for(NuInvoicingPddInfo param : listCrk){
// param.setPdType("3");//作废
// pddInfoMapper.updateById(param);
// }
nuInvoicingPddMainInfo.setUpdateBy(user.getRealname());
nuInvoicingPddMainInfo.setUpdateTime(new Date());
nuInvoicingPddMainInfo.setPddStatus("3");
nuInvoicingPddMainInfo.setPddType("3");
baseMapper.updateById(nuInvoicingPddMainInfo);
map.put("success",true);
map.put("message","操作成功");
DirectiveOrderBizLogEntity qgdInfoEntityDto = new DirectiveOrderBizLogEntity();
qgdInfoEntityDto.setBizTypeCode("PDD");// 业务类型编码（如：ql）
qgdInfoEntityDto.setBizType("盘点单");// 业务类型名称（如：请领）
qgdInfoEntityDto.setBizNo(nuInvoicingPddMainInfo.getPddNo());//业务主表单号（如：Q10120260109001）
qgdInfoEntityDto.setOptType("盘点完成");//操作类型（如：提交）
directiveOrderApi.addBizLog(qgdInfoEntityDto);
return map;
}
@Override
public Map<String, Object> queryPddStartInfo(InvoicingPddInfoEntity invoicingPddInfoEntity) {
List<NuInvoicingPddMain> list = baseMapper.selectList(new QueryWrapper<NuInvoicingPddMain>().eq("pdd_type","1"));
Map<String, Object> map = new HashMap<>();
if(list.size()>0){
map.put("success",false);
map.put("message","有盘点单正在盘点中，请稍后尝试操作！");
return map;
}
map.put("success",true);
map.put("message","入库成功");
return map;
}
//
// /**
// * 工单开始
// * @param dto
// * @return
// */
// @Override
// @Transactional(rollbackFor = Exception.class)
// public Map<String, Object> startDirectiveServe(InvoicingPddInfoEntity dto) {
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// InvoicingOrdersEntity orderEntity = new InvoicingOrdersEntity();
// orderEntity.setId(dto.getId());//指令id
// orderEntity.setInitiatorId(sysUser.getEmployeesId());//员工id
// Map<String, Object> result = invoicingOrdersApi.beginOrder(orderEntity);
// return result;
// }
//
// /**
// * 工单结束
// * @param dto
// * @return
// */
// @Override
// @Transactional(rollbackFor = Exception.class)
// public Map<String, Object> finishDirectiveServe(InvoicingPddInfoEntity dto){
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
// p_.setId(dto.getId());
// p_.setInitiatorId(sysUser.getEmployeesId());
// return invoicingOrdersApi.finishOrder(p_);
// }
}

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

@ -1,11 +1,9 @@
package com.nu.modules.warehouseMaterialInfo.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.nu.entity.QgdInfoEntity;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nu.modules.cgd.entity.NuInvoicingCgdMain;
import com.nu.modules.cgd.mapper.NuInvoicingCgdMainMapper;
import com.nu.modules.pdd.entity.NuInvoicingPddMain;
import com.nu.modules.pdd.mapper.NuInvoicingPddMainMapper;
import com.nu.modules.qgd.entity.QgdInfo;
import com.nu.modules.qgd.mapper.QgdInfoMapper;
import com.nu.modules.qld.entity.NuInvoicingQldGwc;
@ -17,12 +15,9 @@ 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;
@ -49,8 +44,6 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
@Autowired
private NuInvoicingQldMainMapper qldMainMapper;
@Autowired
private NuInvoicingPddMainMapper pddMainMapper;
@Override
@ -127,13 +120,6 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
map.put("success",false);
return map;
}
//查询盘点单是否有占用的数据
List<NuInvoicingPddMain> pddMainList = pddMainMapper.selectPddWlsfzyList(wlId);
if(pddMainList.size()>0){
map.put("message","有库房正在盘点单中，等盘点结束后再进行操作");
map.put("success",false);
return map;
}
map.put("message","无占用");
map.put("success",true);

26
nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml
View File

@ -82,34 +82,8 @@
<select id="queryReadList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">
select employee_id as empId,nu_id,'gd' as type , '工单' as typeName from nu_biz_directive_order where ((employee_id = #{employeesId} and opt_type = '1') or employee_ids in (#{employeesId})) and serv_start_time like CONCAT('%',DATE_FORMAT(NOW(), '%Y-%m-%d'),'%') and (serv_start_time > NOW() or serv_end_time > now()) and emp_end_time is null GROUP BY employee_id,nu_id
union ALL
select create_by as empId,nu_id,'pdd' as type,'盘点单' as typeName from nu_invoicing_pdd_main where pdd_type = '1' and create_by = #{username} GROUP BY create_by,nu_id
</select>
<!-- <update id="updateSbsfTplink">-->
<!-- update nu_iot_tplink_camera-->
<!-- set nu_id = null,-->
<!-- dimension = null-->
<!-- where nu_id = #{nuId}-->
<!-- </update>-->
<!-- <update id="updateSbsfElectricity">-->
<!-- update nu_iot_ds_electricity_meter-->
<!-- set nu_id = null,-->
<!-- dimension = null-->
<!-- where nu_id = #{nuId}-->
<!-- </update>-->
<!-- <update id="updateSbsfWater">-->
<!-- update nu_iot_tq_water_meter-->
<!-- set nu_id = null,-->
<!-- dimension = null-->
<!-- where nu_id = #{nuId}-->
<!-- </update>-->
<!-- <update id="updateSbsfHumid">-->
<!-- update nu_iot_yiweilian_humid_device-->
<!-- set nu_id = null,-->
<!-- dimension = null-->
<!-- where nu_id = #{nuId}-->
<!-- </update>-->
<insert id="addDeviceReleaseLog">
insert into nu_iot_device_bind_log(