From 926c07a0595f9122904a91a890246c3a4a4104ef Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 13 Jun 2024 14:44:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=B1=E7=A0=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InventoryAndWarehousingServiceImpl.java | 8 +++++++- .../mapper/material/InventoryAndWarehousingMapper.xml | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java index c4ac031c..6f238193 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java @@ -209,7 +209,11 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi return res; } - //插入ma_type_put_in_storage_info表,返回主键id + /** + * 插入ma_type_put_in_storage_info表,返回主键id + * @param machIneDto + * @return + */ private int insertInfo(MachIneDto machIneDto) { return inventoryAndWarehousingMapper.saveInfo(machIneDto); } @@ -268,6 +272,8 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi machIneDto.setCreator(dto.getCreator()); machIneDto.setIsCode(dto.getIsCode()); machIneDto.setTotalNum(total); + machIneDto.setUnitId(dto.getUnitId()); + machIneDto.setProId(dto.getProId()); machIneDto.setRemarks(dto.getRemarks()); res += insertInfo(machIneDto); machIneDto.setInfoId(machIneDto.getId()); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml index 10a046bb..5c760549 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml @@ -267,7 +267,6 @@ pisd.MACODE like concat('%',#{keyWord},'%') ) - order by pisi.CREATE_DATE desc