package com.ruoyi.warehouseBusiness.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.basicData.domain.*; import com.ruoyi.basicData.mapper.*; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.reportManagement.domain.TWhgenleg; import com.ruoyi.reportManagement.mapper.TWhgenlegMapper; import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.warehouseBusiness.domain.TEnclosure; import com.ruoyi.warehouseBusiness.domain.TWarehouseBills; import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees; import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems; import com.ruoyi.warehouseBusiness.mapper.TEnclosureMapper; import com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper; import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsfeesMapper; import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsitemsMapper; import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.math.BigDecimal; import java.util.*; /** * 详情主表Service业务层处理 * * @author ruoyi * @date 2020-12-11 */ @Service public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { @Autowired private TWhgenlegMapper tWhgenlegMapper; @Autowired private TGoodsMapper tGoodsMapper; @Autowired private SysDeptMapper sysDeptMapper; @Autowired private SysUserMapper sysUserMapper; @Autowired private TCorpsMapper tCorpsMapper; @Autowired private TFeesMapper tFeesMapper; @Autowired private TWarehouseMapper tWarehouseMapper; @Autowired private TWarehouseAreaMapper tWarehouseAreaMapper; @Autowired private TEnclosureMapper tEnclosureMapper; @Autowired private TWarehouseBillsMapper tWarehouseBillsMapper; @Autowired private TWarehousebillsfeesMapper tWarehousebillsfeesMapper; @Autowired private TWarehousebillsitemsMapper tWarehousebillsitemsMapper; @Autowired private BillnoSerialServiceImpl billnoSerialServiceImpl; /** * 查询详情主表 * * @param fId 详情主表ID * @return 详情主表 */ @Override public Map selectTWarehousebillsById(Long fId) { Map map = new HashMap<>(); // 查询仓库主表数据 TWarehouseBills tWarehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(fId); // 客户表 List corpsId = new ArrayList<>(); // 用户表 List sysUserList = new ArrayList<>(); // 仓库表 List warehouseList = new ArrayList<>(); // 商品 List goodsId = new ArrayList<>(); // 费用 List feesId = new ArrayList<>(); // 库区 List warehouseAreaId = new ArrayList<>(); if (!StringUtils.isNull(tWarehousebills)) { if (StringUtils.isNotNull(tWarehousebills.getfTocorpid())) { corpsId.add(tWarehousebills.getfTocorpid()); } corpsId.add(tWarehousebills.getfCorpid()); // 查询联系人 SysUser sysUser = sysUserMapper.selectUserByUserName(tWarehousebills.getfStorekeeper()); if (StringUtils.isNotNull(sysUser)) { sysUserList.add(sysUser); } // 查询仓库 TWarehouse tWarehouse = tWarehouseMapper.selectTWarehouseById(tWarehousebills.getfWarehouseid()); if (StringUtils.isNotNull(tWarehouse)) { warehouseList.add(tWarehouse); } // 查询经营单位 corpsId.add(tWarehousebills.getfSbu()); map.put("warehousebills", tWarehousebills); } // 查询仓库明细从表数据 TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems(); tWarehousebillsitems.setfPid(fId); List> mapList = tWarehousebillsitemsMapper.selectGoodsTransferitemsList(tWarehousebillsitems); if (StringUtils.isNotEmpty(mapList)) { for (Map wb : mapList) { if (StringUtils.isNotNull(wb.get("fGoodsid"))) { Integer fGoodsid = (Integer) wb.get("fGoodsid"); goodsId.add(fGoodsid.longValue()); } if (StringUtils.isNotNull(wb.get("fWarehouselocid"))) { Integer fWarehouselocid = (Integer) wb.get("fWarehouselocid"); warehouseAreaId.add(fWarehouselocid.longValue()); } } map.put("warehouseBillsItem", mapList); } // 查询仓库费用明细表数据 TWarehousebillsfees tWarehousebillsfees = new TWarehousebillsfees(); tWarehousebillsfees.setfPid(fId); List warehousebillsfeesDr = new ArrayList<>(); List warehousebillsfeesCr = new ArrayList<>(); List warehousebillsfees = tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(tWarehousebillsfees); if (StringUtils.isNotEmpty(warehousebillsfees)) { for (TWarehousebillsfees fees : warehousebillsfees) { if ("C".equals(fees.getfDc())) { warehousebillsfeesCr.add(fees); } else { warehousebillsfeesDr.add(fees); } corpsId.add(fees.getfCorpid()); feesId.add(fees.getfFeeid()); } } // 查询附件表数据 TEnclosure enclosure = new TEnclosure(); enclosure.setfPid(fId); List enclosures = tEnclosureMapper.selectTEnclosureList(enclosure); if (StringUtils.isNotEmpty(enclosures)) { map.put("enclosures", enclosures); } List corpsList = new ArrayList<>(); List corpsIdList = StringUtils.integerDeduplication(corpsId); for (Long corpId : corpsIdList) { TCorps corps = tCorpsMapper.selectTCorpsById(corpId); if (StringUtils.isNotNull(corps)) { corpsList.add(corps); } } List warehouseAreaList = new ArrayList<>(); List warehouseAreaIdList = StringUtils.integerDeduplication(warehouseAreaId); for (Long warehouseArea : warehouseAreaIdList) { TWarehouseArea tWarehouseArea = tWarehouseAreaMapper.selectTWarehouseAreaById(warehouseArea); if (StringUtils.isNotNull(tWarehouseArea)) { warehouseAreaList.add(tWarehouseArea); } } List goodsList = new ArrayList<>(); List goodsIdList = StringUtils.integerDeduplication(goodsId); for (Long goods : goodsIdList) { TGoods tGoods = tGoodsMapper.selectTGoodsById(goods); if (StringUtils.isNotNull(tGoods)) { goodsList.add(tGoods); } } List feesList = new ArrayList<>(); List longList = StringUtils.integerDeduplication(feesId); for (Long fees : longList) { TFees tFees = tFeesMapper.selectTFeesById(fees); if (StringUtils.isNotNull(tFees)) { feesList.add(tFees); } } map.put("corps", corpsList); map.put("goodsList", goodsList); map.put("feesList", feesList); map.put("sysUser", sysUserList); map.put("warehouse", warehouseList); map.put("warehouseAreas", warehouseAreaList); map.put("warehousebillsfeesDr", warehousebillsfeesDr); map.put("warehousebillsfeesCr", warehousebillsfeesCr); map.put("dept", sysDeptMapper.selectDeptById(tWarehousebills.getfDeptid())); return map; } /** * 查询详情主表列表 * * @param tWarehousebills 详情主表 * @return 详情主表 */ @Override public List> selectWarehouseBusinessList(TWarehouseBills tWarehousebills) { return tWarehouseBillsMapper.selectWarehouseBusinessList(tWarehousebills); } /** * 查询导出所需主表列表 * * @param tWarehousebills 详情主表 * @return 详情主表 */ @Override public List selectTWarehousebillsList(TWarehouseBills tWarehousebills) { return tWarehouseBillsMapper.selectTWarehousebillsList(tWarehousebills); } /** * 根据条件查询总账是否存在 * * @param warehouseBills 仓库主表 * @param warehousebillsitems 仓库明细表 * @return 库存总账 */ public TWhgenleg queryTWhgenleg(TWarehouseBills warehouseBills, TWarehousebillsitems warehousebillsitems) { TWhgenleg tWhgenleg = new TWhgenleg(); // 客户 tWhgenleg.setfCorpid(warehouseBills.getfCorpid()); // 提单号 if ("HQZY".equals(warehouseBills.getfBilltype())) { tWhgenleg.setfMblno(warehousebillsitems.getfMblno()); } else { tWhgenleg.setfMblno(warehouseBills.getfMblno()); } // 库区 tWhgenleg.setfWarehouseLocationid(warehousebillsitems.getfWarehouselocid()); // 货物品名 tWhgenleg.setfGoodsid(warehousebillsitems.getfGoodsid()); // 贸易方式 tWhgenleg.setfTrademodeid(warehouseBills.getfTrademodeid()); return tWhgenlegMapper.selectTWhgenleg(tWhgenleg); } /** * 新增库存总账 * * @param warehouseBills 仓库主表 * @param warehousebillsitems 仓库明细表 * @return 结果 */ @Transactional public int instalTWhgenleg(TWarehouseBills warehouseBills, TWarehousebillsitems warehousebillsitems, SysUser user) { TWhgenleg tWhgenleg = new TWhgenleg(); if ("SJRK".equals(warehouseBills.getfBilltype()) || "HQZY".equals(warehouseBills.getfBilltype())) { tWhgenleg.setfOriginalbilldate(new Date()); } // 客户 tWhgenleg.setfCorpid(warehouseBills.getfCorpid()); // 提单号 tWhgenleg.setfMblno(warehouseBills.getfMblno()); // 原始单号 tWhgenleg.setfOriginalbillno(warehouseBills.getfMblno()); // 仓库 tWhgenleg.setfWarehouseid(warehouseBills.getfWarehouseid()); // 库区 tWhgenleg.setfWarehouseLocationid(warehousebillsitems.getfWarehouselocid()); // 货物品名 tWhgenleg.setfGoodsid(warehousebillsitems.getfGoodsid()); // 贸易方式 tWhgenleg.setfTrademodeid(warehouseBills.getfTrademodeid()); // 入库数 tWhgenleg.setfQtyd(warehousebillsitems.getfQty()); // 入库尺码 tWhgenleg.setfVolumnd(warehousebillsitems.getfVolumn()); // 唛头 tWhgenleg.setfMarks(warehousebillsitems.getfMarks()); // 入库毛重 tWhgenleg.setfGrossweightd(warehousebillsitems.getfGrossweight()); // 入库净重 tWhgenleg.setfNetweightd(warehousebillsitems.getfNetweight()); // 入库箱号 tWhgenleg.setfCntrno(warehousebillsitems.getfCntrno()); // 创建人 tWhgenleg.setCreateBy(user.getUserName()); // 创建人 tWhgenleg.setCreateTime(new Date()); // 状态 tWhgenleg.setfStatus("T"); // 结余件数 tWhgenleg.setfQtyblc(warehousebillsitems.getfQty()); System.out.println("主表新增:" + warehouseBills.toString()); System.out.println("要添加的总账:" + tWhgenleg.toString()); return tWhgenlegMapper.insertTWhgenleg(tWhgenleg); } @Transactional public int updateTWhgenlegData(TWarehousebillsitems warehousebillsitems, long whgenlegId, String billtype) { Map map = new HashMap<>(); map.put("whgenlegId", whgenlegId); map.put("billType", billtype); map.put("warehousebillsitems", warehousebillsitems); return tWhgenlegMapper.updateTWhgenlegData(map); } /** * 新增详情主表 * * @param tWarehouseBills 仓库主表 * @param tWarehousebillsfeesCr 仓库费付款用明细表 * @param tWarehousebillsfeesDr 仓库费收 * 款用明细表 * @param tWarehousebillsitems 仓库货物明细表 * @param loginUser 当前登陆人 * @param billsType 判断标识 * @return 结果 */ @Override @Transactional public AjaxResult insertTWarehousebills(String tWarehouseBills, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr , String tWarehousebillsitems, String tWhgenleg, LoginUser loginUser, String billsType) { Long fPid = null; TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class); if (StringUtils.isNull(warehouseBills.getfId())) { // 如果是新数据 warehouseBills.setCreateBy(loginUser.getUser().getUserName()); warehouseBills.setfBilltype(billsType); warehouseBills.setfBsdeptid(loginUser.getUser().getDeptId()); // 提交时: 生流水号 if ("6".equals(warehouseBills.getfBillstatus())) { // 业务编码 String billNo = billnoSerialServiceImpl.getBillNo(billsType, warehouseBills.getfBsdate()); warehouseBills.setfBillno(billNo); // 存货编码 Date time = new Date(); String bscorpno = billnoSerialServiceImpl.getCorpNo(warehouseBills.getfCorpid(), time); warehouseBills.setfBscorpno(bscorpno); } tWarehouseBillsMapper.insertTWarehousebills(warehouseBills); fPid = warehouseBills.getfId(); } else { // 提交时: 生流水号 if ("6".equals(warehouseBills.getfBillstatus())) { // 业务编码 String billNo = billnoSerialServiceImpl.getBillNo(billsType, warehouseBills.getfBsdate()); warehouseBills.setfBillno(billNo); // 存货编码 Date time = new Date(); String bscorpno = billnoSerialServiceImpl.getCorpNo(warehouseBills.getfCorpid(), time); warehouseBills.setfBscorpno(bscorpno); } fPid = warehouseBills.getfId(); warehouseBills.setUpdateBy(loginUser.getUser().getUserName()); warehouseBills.setUpdateTime(new Date()); tWarehouseBillsMapper.updateTWarehousebills(warehouseBills); tWarehousebillsitemsMapper.deleteByFPid(fPid); tWarehousebillsfeesMapper.deleteByFPid(fPid); tEnclosureMapper.deleteByFPid(fPid); } // 查询库存总账 库存明细不为空 并且 入库不是暂存状态 进行库存总账的查询新增修改 if (tWarehousebillsitems != null && !"2".equals(warehouseBills.getfBillstatus())) { JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems); List warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class); int i=1; for (TWarehousebillsitems wbItem : warehousebillsitemsList) { // 查询总账是否存在 TWhgenleg tWhgenle = queryTWhgenleg(warehouseBills, wbItem); if ("SJRK".equals(billsType)) { // 入库数 、结余数 if (StringUtils.isNull(tWhgenle)) { // 为空添加库存总账 instalTWhgenleg(warehouseBills, wbItem, loginUser.getUser()); } else { // 非空修改库存总账 if ("6".equals(warehouseBills.getfBillstatus())) { updateTWhgenlegData(wbItem, tWhgenle.getfId(), billsType); } } } else if ("SJCK".equals(billsType)) { // 出库 查询 if (StringUtils.isNull(tWhgenle)) { // 为空 提示没有库存 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("库存明细第"+i+"行库存为空"); } else { // 非空修改库存总账 if ("6".equals(warehouseBills.getfBillstatus())) { // 库存 < 出库件数 提示库存不足 if (tWhgenle.getfQtyblc() < wbItem.getfQty()) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("库存明细第"+i+"行库存不足"); } updateTWhgenlegData(wbItem, tWhgenle.getfId(), billsType); } } } else if ("CKDB".equals(billsType)) { // 调拨查询 if (StringUtils.isNull(tWhgenle)) { // 为空 提示没有库存 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("库存明细第"+i+"行库存为空"); } else { // 非空修改库存总账 if ("6".equals(warehouseBills.getfBillstatus())) { if (tWhgenle.getfQtyblc() < wbItem.getfQty()) { // 1、 库存 < 调拨件数 提示库存不足 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("库存明细第"+i+"行库存不足"); } else { // 2、 库存足够 先 进行出库操作 updateTWhgenlegData(wbItem, tWhgenle.getfId(), "SJCK"); } // 3、 进行入库操作 查询是否存在库存 warehouseBills.setfCorpid(warehouseBills.getfTocorpid()); // 新货权方 TWhgenleg tWhgenle1 = queryTWhgenleg(warehouseBills, wbItem); if (StringUtils.isNull(tWhgenle1)) { // 5、 不存在 进行新增库存 instalTWhgenleg(warehouseBills, wbItem, loginUser.getUser()); } else { // 4、 存在 进行跟新库存 if ("6".equals(warehouseBills.getfBillstatus())) { updateTWhgenlegData(wbItem, tWhgenle1.getfId(), "SJRK"); } } } } } else if ("HQZY".equals(billsType)) { // 货转 if (StringUtils.isNull(tWhgenle)) { // 为空 提示没有库存 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("库存明细第"+i+"行库存为空"); } else { // 非空修改库存总账 if ("6".equals(warehouseBills.getfBillstatus())) { if (tWhgenle.getfQtyblc() < wbItem.getfQty()) { // 1、 库存 < 调拨件数 提示库存不足 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("库存明细第"+i+"行库存不足"); } else { // 2、 库存足够 先 进行出库操作 updateTWhgenlegData(wbItem, tWhgenle.getfId(), "SJCK"); } // 3、 进行入库操作 查询是否存在库存 warehouseBills.setfCorpid(warehouseBills.getfTocorpid()); // 新货权方 TWhgenleg tWhgenle1 = queryTWhgenleg(warehouseBills, wbItem); if (StringUtils.isNull(tWhgenle1)) { // 5、 不存在 进行新增库存 instalTWhgenleg(warehouseBills, wbItem, loginUser.getUser()); } else { // 4、 存在 进行跟新库存 updateTWhgenlegData(wbItem, tWhgenle1.getfId(), "SJRK"); } } } } i++; } } // 库存明细添加 if (tWarehousebillsitems != null) { JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems); List warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class); for (TWarehousebillsitems wbItem : warehousebillsitemsList) { wbItem.setfPid(fPid); wbItem.setfMarks(warehouseBills.getfMarks()); wbItem.setfMblno(warehouseBills.getfMblno()); wbItem.setCreateBy(loginUser.getUser().getUserName()); wbItem.setCreateTime(new Date()); tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem); } } // 附件添加 if (StringUtils.isNotNull(tWhgenleg)) { JSONArray jsonDrArray = JSONArray.parseArray(tWhgenleg); List tEnclosureList = JSONObject.parseArray(jsonDrArray.toJSONString(), TEnclosure.class); for (TEnclosure tEnclosure : tEnclosureList) { tEnclosure.setfPid(fPid); tEnclosure.setCreateBy(loginUser.getUser().getUserName()); tEnclosure.setCreateTime(new Date()); tEnclosureMapper.insertTEnclosure(tEnclosure); } } // 收款明细添加 if (tWarehousebillsfeesDr != null) { JSONArray jsonDrArray = JSONArray.parseArray(tWarehousebillsfeesDr); List warehousebillsfeesDrList = JSONObject.parseArray(jsonDrArray.toJSONString(), TWarehousebillsfees.class); for (TWarehousebillsfees wbDr : warehousebillsfeesDrList) { // 检验 数量*单价=金额 wbDr.setfPid(fPid); wbDr.setfDc("D"); wbDr.setCreateBy(loginUser.getUser().getUserName()); wbDr.setCreateTime(new Date()); tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr); } } // 付款明细添加 if (tWarehousebillsfeesCr != null) { JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsfeesCr); List warehousebillsfeesCrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsfees.class); for (TWarehousebillsfees wbCr : warehousebillsfeesCrList) { wbCr.setfPid(fPid); wbCr.setfDc("C"); wbCr.setCreateBy(loginUser.getUser().getUserName()); wbCr.setCreateTime(new Date()); tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr); } } return AjaxResult.success(); } // 入库 收费明细 校验 public Long check(BigDecimal number, BigDecimal unitPrice) { BigDecimal result1 = number.multiply(unitPrice); // 保留两位小数且四舍五入 result1 = result1.setScale(2, BigDecimal.ROUND_HALF_UP); // 转换去掉小数点 String result = result1.toString().replace(".", ""); return Long.valueOf(result); } /** * 修改详情主表 * * @param tWarehousebills 详情主表 * @return 结果 */ @Override public int updateTWarehousebills(TWarehouseBills tWarehousebills) { tWarehousebills.setUpdateTime(DateUtils.getNowDate()); return tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills); } /** * 批量删除详情主表 * * @param fIds 需要删除的详情主表ID * @return 结果 */ @Override public int deleteTWarehousebillsByIds(Long[] fIds) { return tWarehouseBillsMapper.deleteTWarehousebillsByIds(fIds); } /** * 删除详情主表信息 * * @param fId 详情主表ID * @return 结果 */ @Override public int deleteTWarehousebillsById(Long fId) { return tWarehouseBillsMapper.deleteTWarehousebillsById(fId); } @Override public String getWarehouseInStockBillsNo(TWarehouseBills tWarehouseBills) { return null; } @Override public String getWarehouseOutStockBillsNo(TWarehouseBills tWarehouseBills) { return null; } @Override public AjaxResult revokeTWarehousebillsById(Long fId, LoginUser loginUser, String billsType) { // 查询 仓库主表信息、库存明细信息 TWarehouseBills tWarehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(fId); // 修改主表信息 tWarehousebills.setUpdateBy(loginUser.getUser().getUserName()); tWarehousebills.setUpdateTime(new Date()); tWarehousebills.setfBillstatus("3"); //撤销状态 tWarehouseBillsMapper.updateTWarehousebills(tWarehousebills); // 查询库存明细从表数据 TWarehousebillsitems tWarehousebillsitems = new TWarehousebillsitems(); tWarehousebillsitems.setfPid(fId); List warehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsList(tWarehousebillsitems); // 撤销 库存总账 if (StringUtils.isNotEmpty(warehousebillsitems)) { int i=1; for (TWarehousebillsitems wb : warehousebillsitems) { // 查询库存总账 TWhgenleg tWhgenle=queryTWhgenleg(tWarehousebills,wb); if("SJRKRevoke".equals(billsType)){ // 撤销 入库 if(StringUtils.isNotNull(tWhgenle) && (wb.getfQty() <= tWhgenle.getfQtyblc()) ){ // 非空 且 撤销数 <= 结余数 updateTWhgenlegData(wb,tWhgenle.getfId(),billsType); } else{ // 撤销数>结余数 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("第"+i+"行撤销数大于库存结余数"); } } else if("SJCKRevoke".equals(billsType)){ // 撤销出库 if(StringUtils.isNotNull(tWhgenle) ){ // 非空 updateTWhgenlegData(wb,tWhgenle.getfId(),billsType); } else{ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("第"+i+"行未查询到库存信息"); } } else if("CKDBRevoke".equals(billsType)){ // 调拨 撤销 Long fCorpid=tWarehousebills.getfCorpid();// 原货权方 Long fTocorpid=tWarehousebills.getfTocorpid(); // 新货权方 // 1、新货权方撤销入库 // 查询库存总账 tWarehousebills.setfCorpid(fTocorpid); TWhgenleg tWhgenle1=queryTWhgenleg(tWarehousebills,wb); if(StringUtils.isNotNull(tWhgenle1) && (wb.getfQty() <= tWhgenle1.getfQtyblc())){ updateTWhgenlegData(wb,tWhgenle1.getfId(),"SJRKRevoke"); }else{ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("第"+i+"行撤销数大于库存结余数"); } // 2、原货权方撤销出库 // 查询库存总账 tWarehousebills.setfCorpid(fCorpid); TWhgenleg tWhgenle2=queryTWhgenleg(tWarehousebills,wb); updateTWhgenlegData(wb,tWhgenle2.getfId(),"SJCKRevoke"); } else if("HQZYRevoke".equals(billsType)){ // 货转撤销 HQZYRevoke Long fCorpid=tWarehousebills.getfCorpid();// 原货权方 Long fTocorpid=tWarehousebills.getfTocorpid(); // 新货权方 // 1、新货权方撤销入库 // 查询库存总账 tWarehousebills.setfCorpid(fTocorpid); TWhgenleg tWhgenle1=queryTWhgenleg(tWarehousebills,wb); if(StringUtils.isNotNull(tWhgenle1) && (wb.getfQty() <= tWhgenle1.getfQtyblc())){ updateTWhgenlegData(wb,tWhgenle1.getfId(),"SJRKRevoke"); }else{ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("第"+i+"行撤销数大于库存结余数"); } // 2、原货权方撤销出库 // 查询库存总账 tWarehousebills.setfCorpid(fCorpid); TWhgenleg tWhgenle2=queryTWhgenleg(tWarehousebills,wb); updateTWhgenlegData(wb,tWhgenle2.getfId(),"SJCKRevoke"); } i++; } } return AjaxResult.success(); } }