From 3b2bea761fd48992dc8c4bb95f0c3e0f58f996e7 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Fri, 11 Jul 2025 14:12:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ImsIntoInventoryController.java | 3 +- .../ims/mapper/ImsIntoInventoryMapper.java | 12 +++--- .../core/ims/mapper/ImsInventoryMapper.java | 5 ++- .../ims/mapper/ImsOutInventoryMapper.java | 10 +++-- .../ims/service/IImsIntoInventoryService.java | 3 +- .../impl/ImsIntoInventoryServiceImpl.java | 33 ++------------- .../service/impl/ImsInventoryServiceImpl.java | 22 ++++------ .../impl/ImsOutInventoryServiceImpl.java | 42 +++++-------------- .../mapper/ims/ImsIntoInventoryMapper.xml | 14 +++---- .../mapper/ims/ImsInventoryMapper.xml | 4 +- .../mapper/ims/ImsOutInventoryMapper.xml | 14 +++---- 11 files changed, 59 insertions(+), 103 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsIntoInventoryController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsIntoInventoryController.java index 8216c08..f11b03c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsIntoInventoryController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ImsIntoInventoryController.java @@ -9,6 +9,7 @@ import com.bonus.canteen.core.ims.domain.ImsIntoInventoryDetail; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryAdd; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryQuery; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryUpdate; +import com.bonus.canteen.core.ims.domain.vo.ImsIntoInventoryDetailVO; import com.bonus.canteen.core.ims.domain.vo.ImsIntoInventoryVO; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.poi.ExcelUtil; @@ -66,7 +67,7 @@ public class ImsIntoInventoryController extends BaseController public TableDataInfo selectDetailListByWarehouseIdAndMaterialId(@RequestBody ImsIntoInventoryQuery imsIntoInventoryQuery) { startPage(); - List list = imsIntoInventoryService. + List list = imsIntoInventoryService. selectDetailListByWarehouseIdAndMaterialId(imsIntoInventoryQuery); return getDataTable(list); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsIntoInventoryMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsIntoInventoryMapper.java index 248095b..111b1c0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsIntoInventoryMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsIntoInventoryMapper.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.util.List; import com.bonus.canteen.core.ims.domain.ImsIntoInventory; import com.bonus.canteen.core.ims.domain.ImsIntoInventoryDetail; +import com.bonus.canteen.core.ims.domain.vo.ImsIntoInventoryDetailVO; +import com.bonus.canteen.core.ims.domain.vo.ImsIntoInventoryVO; import org.apache.ibatis.annotations.Param; /** @@ -19,7 +21,7 @@ public interface ImsIntoInventoryMapper { * @param intoId 入库记录主键 * @return 入库记录 */ - public ImsIntoInventory selectImsIntoInventoryByIntoId(Long intoId); + public ImsIntoInventoryVO selectImsIntoInventoryByIntoId(Long intoId); /** * 查询入库记录列表 @@ -27,7 +29,7 @@ public interface ImsIntoInventoryMapper { * @param imsIntoInventory 入库记录 * @return 入库记录集合 */ - public List selectImsIntoInventoryList(ImsIntoInventory imsIntoInventory); + public List selectImsIntoInventoryList(ImsIntoInventory imsIntoInventory); /** * 新增入库记录 @@ -86,11 +88,11 @@ public interface ImsIntoInventoryMapper { */ public int deleteImsIntoInventoryDetailByIntoId(Long intoId); - public List selectImsIntoInventoryDetailListByInventoryId(Long inventoryId); + public List selectImsIntoInventoryDetailListByInventoryId(Long inventoryId); public int updateIntoInventoryNum(@Param("intoDetailId") Long intoDetailId, @Param("fetchNum") BigDecimal fetchNum); - public ImsIntoInventoryDetail selectImsIntoInventoryDetailListByIntoDetailId(@Param("intoDetailId") Long intoDetailId); + public ImsIntoInventoryDetailVO selectImsIntoInventoryDetailListByIntoDetailId(@Param("intoDetailId") Long intoDetailId); - public List selectDetailListByWarehouseIdAndMaterialId(ImsIntoInventory imsIntoInventory); + public List selectDetailListByWarehouseIdAndMaterialId(ImsIntoInventory imsIntoInventory); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsInventoryMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsInventoryMapper.java index 65b780c..1a9f1e1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsInventoryMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsInventoryMapper.java @@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.mapper; import java.util.List; import com.bonus.canteen.core.ims.domain.ImsInventory; +import com.bonus.canteen.core.ims.domain.vo.ImsInventoryVO; /** * 库存Mapper接口 @@ -17,7 +18,7 @@ public interface ImsInventoryMapper * @param inventoryId 库存主键 * @return 库存 */ - public ImsInventory selectImsInventoryByInventoryId(Long inventoryId); + public ImsInventoryVO selectImsInventoryByInventoryId(Long inventoryId); /** * 查询库存列表 @@ -25,7 +26,7 @@ public interface ImsInventoryMapper * @param imsInventory 库存 * @return 库存集合 */ - public List selectImsInventoryList(ImsInventory imsInventory); + public List selectImsInventoryList(ImsInventory imsInventory); /** * 新增库存 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsOutInventoryMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsOutInventoryMapper.java index d577c72..5768d2f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsOutInventoryMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ImsOutInventoryMapper.java @@ -3,6 +3,8 @@ package com.bonus.canteen.core.ims.mapper; import java.util.List; import com.bonus.canteen.core.ims.domain.ImsOutInventory; import com.bonus.canteen.core.ims.domain.ImsOutInventoryDetail; +import com.bonus.canteen.core.ims.domain.vo.ImsOutInventoryDetailVO; +import com.bonus.canteen.core.ims.domain.vo.ImsOutInventoryVO; import org.apache.ibatis.annotations.Param; /** @@ -18,7 +20,7 @@ public interface ImsOutInventoryMapper { * @param outId 出库记录主键 * @return 出库记录 */ - public ImsOutInventory selectImsOutInventoryByOutId(Long outId); + public ImsOutInventoryVO selectImsOutInventoryByOutId(Long outId); /** * 查询出库记录列表 @@ -26,7 +28,7 @@ public interface ImsOutInventoryMapper { * @param imsOutInventory 出库记录 * @return 出库记录集合 */ - public List selectImsOutInventoryList(ImsOutInventory imsOutInventory); + public List selectImsOutInventoryList(ImsOutInventory imsOutInventory); /** * 新增出库记录 @@ -85,7 +87,7 @@ public interface ImsOutInventoryMapper { */ public int deleteImsOutInventoryDetailByOutId(Long outId); - public List selectImsOutInventoryDetailList(@Param("outId") Long outId); + public List selectImsOutInventoryDetailList(@Param("outId") Long outId); - public List selectImsOutInventoryDetailListWithoutIntoId(@Param("outId") Long outId); + public List selectImsOutInventoryDetailListWithoutIntoId(@Param("outId") Long outId); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsIntoInventoryService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsIntoInventoryService.java index 87243d8..7d0b51e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsIntoInventoryService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IImsIntoInventoryService.java @@ -6,6 +6,7 @@ import com.bonus.canteen.core.ims.domain.ImsIntoInventoryDetail; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryAdd; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryQuery; import com.bonus.canteen.core.ims.domain.param.ImsIntoInventoryUpdate; +import com.bonus.canteen.core.ims.domain.vo.ImsIntoInventoryDetailVO; import com.bonus.canteen.core.ims.domain.vo.ImsIntoInventoryVO; import org.apache.ibatis.annotations.Param; @@ -65,5 +66,5 @@ public interface IImsIntoInventoryService */ public int deleteImsIntoInventoryByIntoId(Long intoId); - public List selectDetailListByWarehouseIdAndMaterialId(ImsIntoInventoryQuery imsIntoInventoryQuery); + public List selectDetailListByWarehouseIdAndMaterialId(ImsIntoInventoryQuery imsIntoInventoryQuery); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsIntoInventoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsIntoInventoryServiceImpl.java index 9e3bf90..78083ca 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsIntoInventoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsIntoInventoryServiceImpl.java @@ -50,23 +50,7 @@ public class ImsIntoInventoryServiceImpl implements IImsIntoInventoryService @Override public ImsIntoInventoryVO selectImsIntoInventoryByIntoId(Long intoId) { - ImsIntoInventory imsIntoInventory = imsIntoInventoryMapper.selectImsIntoInventoryByIntoId(intoId); - ImsIntoInventoryVO imsIntoInventoryVO = null; - if(Objects.nonNull(imsIntoInventory)) { - imsIntoInventoryVO = new ImsIntoInventoryVO(); - BeanUtils.copyProperties(imsIntoInventory, imsIntoInventoryVO); - List imsIntoInventoryDetails = imsIntoInventory.getImsIntoInventoryDetailList(); - if(CollUtil.isNotEmpty(imsIntoInventoryDetails)) { - List imsIntoInventoryDetailVOList = new ArrayList<>(); - for(ImsIntoInventoryDetail detail : imsIntoInventoryDetails) { - ImsIntoInventoryDetailVO imsIntoInventoryDetailVO = new ImsIntoInventoryDetailVO(); - BeanUtils.copyProperties(detail, imsIntoInventoryDetailVO); - imsIntoInventoryDetailVOList.add(imsIntoInventoryDetailVO); - } - imsIntoInventoryVO.setImsIntoInventoryDetailVOList(imsIntoInventoryDetailVOList); - } - } - return imsIntoInventoryVO; + return imsIntoInventoryMapper.selectImsIntoInventoryByIntoId(intoId); } /** @@ -80,16 +64,7 @@ public class ImsIntoInventoryServiceImpl implements IImsIntoInventoryService { ImsIntoInventory imsIntoInventory = new ImsIntoInventory(); BeanUtils.copyProperties(imsIntoInventoryQuery, imsIntoInventory); - List imsIntoInventoryList = imsIntoInventoryMapper.selectImsIntoInventoryList(imsIntoInventory); - List imsIntoInventoryVOList = new ArrayList<>(); - if(CollUtil.isNotEmpty(imsIntoInventoryList)) { - for (ImsIntoInventory intoInventory : imsIntoInventoryList) { - ImsIntoInventoryVO imsIntoInventoryVO = new ImsIntoInventoryVO(); - BeanUtils.copyProperties(intoInventory, imsIntoInventoryVO); - imsIntoInventoryVOList.add(imsIntoInventoryVO); - } - } - return imsIntoInventoryVOList; + return imsIntoInventoryMapper.selectImsIntoInventoryList(imsIntoInventory); } /** @@ -168,7 +143,7 @@ public class ImsIntoInventoryServiceImpl implements IImsIntoInventoryService } @Override - public List selectDetailListByWarehouseIdAndMaterialId(ImsIntoInventoryQuery imsIntoInventoryQuery) { + public List selectDetailListByWarehouseIdAndMaterialId(ImsIntoInventoryQuery imsIntoInventoryQuery) { ImsIntoInventory imsIntoInventory = new ImsIntoInventory(); BeanUtils.copyProperties(imsIntoInventoryQuery, imsIntoInventory); return imsIntoInventoryMapper.selectDetailListByWarehouseIdAndMaterialId(imsIntoInventory); @@ -221,7 +196,7 @@ public class ImsIntoInventoryServiceImpl implements IImsIntoInventoryService imsIntoInventoryDetail.setInventoryId(inventoryId); } } - if (list.size() > 0) + if (!list.isEmpty()) { imsIntoInventoryMapper.batchImsIntoInventoryDetail(list); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsInventoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsInventoryServiceImpl.java index d731b39..f3470e0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsInventoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsInventoryServiceImpl.java @@ -49,13 +49,7 @@ public class ImsInventoryServiceImpl implements IImsInventoryService @Override public ImsInventoryVO selectImsInventoryByInventoryId(Long inventoryId) { - ImsInventory imsInventory = imsInventoryMapper.selectImsInventoryByInventoryId(inventoryId); - ImsInventoryVO imsInventoryVO = null; - if(Objects.nonNull(imsInventory)) { - imsInventoryVO = new ImsInventoryVO(); - BeanUtils.copyProperties(imsInventory, imsInventoryVO); - } - return imsInventoryVO; + return imsInventoryMapper.selectImsInventoryByInventoryId(inventoryId); } /** @@ -69,18 +63,18 @@ public class ImsInventoryServiceImpl implements IImsInventoryService { ImsInventory imsInventory = new ImsInventory(); BeanUtils.copyProperties(imsInventoryQuery, imsInventory); - List imsInventoryList = imsInventoryMapper.selectImsInventoryList(imsInventory); + List imsInventoryList = imsInventoryMapper.selectImsInventoryList(imsInventory); List imsInventoryVOList = new ArrayList<>(); if(CollUtil.isNotEmpty(imsInventoryList)) { Map materialIdCountMap = imsInventoryList.stream() - .collect(Collectors.groupingBy(ImsInventory::getMaterialId, - Collectors.mapping(ImsInventory::getMaterialNum, + .collect(Collectors.groupingBy(ImsInventoryVO::getMaterialId, + Collectors.mapping(ImsInventoryVO::getMaterialNum, Collectors.reducing(BigDecimal.ZERO, BigDecimal::add)))); - for(ImsInventory inventory : imsInventoryList) { - List imsIntoInventoryDetailList = + for(ImsInventoryVO inventory : imsInventoryList) { + List imsIntoInventoryDetailVOList = imsIntoInventoryMapper.selectImsIntoInventoryDetailListByInventoryId(inventory.getInventoryId()); - Map inventoryIdToTotalPrice = imsIntoInventoryDetailList.stream() - .collect(Collectors.groupingBy(ImsIntoInventoryDetail::getInventoryId, + Map inventoryIdToTotalPrice = imsIntoInventoryDetailVOList.stream() + .collect(Collectors.groupingBy(ImsIntoInventoryDetailVO::getInventoryId, Collectors.mapping(detail -> detail.getInventoryNum().multiply(BigDecimal.valueOf(detail.getUnitPrice())), Collectors.reducing(BigDecimal.ZERO, BigDecimal::add)))); ImsInventoryVO imsInventoryVO = new ImsInventoryVO(); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java index 83f63c4..4fb8b74 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ImsOutInventoryServiceImpl.java @@ -6,6 +6,7 @@ import java.util.List; import cn.hutool.core.collection.CollUtil; import com.bonus.canteen.core.ims.domain.*; import com.bonus.canteen.core.ims.domain.param.*; +import com.bonus.canteen.core.ims.domain.vo.ImsIntoInventoryDetailVO; import com.bonus.canteen.core.ims.domain.vo.ImsOutInventoryDetailVO; import com.bonus.canteen.core.ims.domain.vo.ImsOutInventoryVO; import com.bonus.canteen.core.ims.mapper.ImsIntoInventoryMapper; @@ -55,27 +56,15 @@ public class ImsOutInventoryServiceImpl implements IImsOutInventoryService @Override public ImsOutInventoryVO selectImsOutInventoryByOutId(Long outId) { - ImsOutInventory imsOutInventory = imsOutInventoryMapper.selectImsOutInventoryByOutId(outId); - ImsOutInventoryVO imsOutInventoryVO = null; - if(Objects.nonNull(imsOutInventory)) { - imsOutInventoryVO = new ImsOutInventoryVO(); - BeanUtils.copyProperties(imsOutInventory, imsOutInventoryVO); - List imsOutInventoryDetails; - if(imsOutInventory.getStatus() == 1) { + ImsOutInventoryVO imsOutInventoryVO = imsOutInventoryMapper.selectImsOutInventoryByOutId(outId); + if(Objects.nonNull(imsOutInventoryVO)) { + List imsOutInventoryDetails = null; + if(imsOutInventoryVO.getStatus() == 1) { imsOutInventoryDetails = imsOutInventoryMapper.selectImsOutInventoryDetailListWithoutIntoId(outId); }else{ imsOutInventoryDetails = imsOutInventoryMapper.selectImsOutInventoryDetailList(outId); } - - if(CollUtil.isNotEmpty(imsOutInventoryDetails)) { - List imsOutInventoryDetailVOList = new ArrayList<>(); - for(ImsOutInventoryDetail detail : imsOutInventoryDetails) { - ImsOutInventoryDetailVO imsIntoInventoryDetailVO = new ImsOutInventoryDetailVO(); - BeanUtils.copyProperties(detail, imsIntoInventoryDetailVO); - imsOutInventoryDetailVOList.add(imsIntoInventoryDetailVO); - } - imsOutInventoryVO.setImsOutInventoryDetailVOList(imsOutInventoryDetailVOList); - } + imsOutInventoryVO.setImsOutInventoryDetailVOList(imsOutInventoryDetails); } @@ -93,16 +82,7 @@ public class ImsOutInventoryServiceImpl implements IImsOutInventoryService { ImsOutInventory imsOutInventory = new ImsOutInventory(); BeanUtils.copyProperties(imsOutInventoryQuery, imsOutInventory); - List imsOutInventoryList = imsOutInventoryMapper.selectImsOutInventoryList(imsOutInventory); - List imsOutInventoryVOS = new ArrayList<>(); - if(CollUtil.isNotEmpty(imsOutInventoryList)) { - for (ImsOutInventory outInventory : imsOutInventoryList) { - ImsOutInventoryVO imsOutInventoryVO = new ImsOutInventoryVO(); - BeanUtils.copyProperties(outInventory, imsOutInventoryVO); - imsOutInventoryVOS.add(imsOutInventoryVO); - } - } - return imsOutInventoryVOS; + return imsOutInventoryMapper.selectImsOutInventoryList(imsOutInventory); } /** @@ -228,11 +208,11 @@ public class ImsOutInventoryServiceImpl implements IImsOutInventoryService throw new ServiceException("库存不足"); } if(Objects.isNull(imsOutInventoryDetail.getIntoDetailId())) { - List imsIntoInventoryDetailList = imsIntoInventoryMapper + List imsIntoInventoryDetailList = imsIntoInventoryMapper .selectImsIntoInventoryDetailListByInventoryId(imsOutInventoryDetail.getInventoryId()); BigDecimal tempFetchLeftNum = imsOutInventoryDetail.getFetchNum(); long totalPrice = 0L; - for(ImsIntoInventoryDetail imsIntoInventoryDetail : imsIntoInventoryDetailList) { + for(ImsIntoInventoryDetailVO imsIntoInventoryDetail : imsIntoInventoryDetailList) { if(tempFetchLeftNum.compareTo(BigDecimal.ZERO) == 0) { break; } @@ -273,7 +253,7 @@ public class ImsOutInventoryServiceImpl implements IImsOutInventoryService } totalPriceSum += totalPrice; }else { - ImsIntoInventoryDetail imsIntoInventoryDetail = imsIntoInventoryMapper + ImsIntoInventoryDetailVO imsIntoInventoryDetail = imsIntoInventoryMapper .selectImsIntoInventoryDetailListByIntoDetailId(imsOutInventoryDetail.getIntoDetailId()); if(Objects.nonNull(imsIntoInventoryDetail)) { if(Objects.isNull(imsOutInventoryDetail.getFetchNum())) { @@ -303,7 +283,7 @@ public class ImsOutInventoryServiceImpl implements IImsOutInventoryService list.add(imsOutInventoryDetail); } } - if (list.size() > 0) + if (!list.isEmpty()) { imsOutInventoryMapper.batchImsOutInventoryDetail(list); imsOutInventory.setTotalAmount(totalPriceSum); diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml index 1231488..6f22422 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsIntoInventoryMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -30,11 +30,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + - + @@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select into_id, into_code, iii.warehouse_id, into_date, total_num, into_type, status, refund_out_id, relate_delivery_goods_id, total_amount, relate_order_goods_id, relate_inspect_goods_id, into_relate_out_id, - goods_allocation_id, remark, iii.del_flag, iii.create_by, iii.create_time, + goods_allocation_id, remark, iii.create_by, iii.create_time, iii.update_by, iii.update_time, iwi.warehouse_name, ba.area_name, ba.area_id from ims_into_inventory iii left join ims_warehouse_info iwi on iii.warehouse_id = iwi.warehouse_id diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml index dcf8c00..ec70016 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsInventoryMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml index 3742692..f09ae31 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ImsOutInventoryMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select out_detail_id, out_id, out_code, ioid.inventory_id, fetch_num, ioid.total_price, - ioid.into_detail_id, interval_id, ioid.size, ioid.img_url, if_overdraft, ioid.remark, ioid.del_flag, + ioid.into_detail_id, interval_id, ioid.size, ioid.img_url, if_overdraft, ioid.remark, ioid.create_by, ioid.create_time, ioid.update_by, ioid.update_time, cm.material_name, cmt.material_type_name, iu.unit_name, cm.bar_code, cm.size AS material_size, cm.material_code, iiid.inventory_num, iiid.expire_time, iii.into_date, iii.into_code @@ -138,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"