diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java index 66b1db4..9b58ba2 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleext; -import java.util.List; import java.math.BigDecimal; +import java.util.List; import java.util.Map; /** @@ -49,4 +49,13 @@ public interface MdPbStoragevehicleextMapper extends BaseMapper */ List erpQueryIvt(@Param("param") JSONObject whereJson); + + /** + * 手持出库确认查询明细 + * @param whereJson { + * storagevehicle_code: 载具号 + * } + * @return List + */ + List getIosDtl(@Param("param") JSONObject whereJson); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml index 60b40bb..ddbcc06 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml @@ -21,7 +21,7 @@ attr.struct_code AS turnout_struct_code FROM md_pb_storagevehicleext ext - LEFT JOIN md_me_materialbase material ON material.material_id = ext.material_id + INNER JOIN md_me_materialbase material ON material.material_id = ext.material_id INNER JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code attr.lock_type = '0' @@ -74,8 +74,8 @@ mater.material_name FROM md_pb_storagevehicleext ext - LEFT JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code - LEFT JOIN md_me_materialbase mater ON mater.material_id = ext.material_id + INNER JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code + INNER JOIN md_me_materialbase mater ON mater.material_id = ext.material_id 1 = 1 @@ -135,9 +135,9 @@ ext.insert_time AS in_time FROM md_pb_storagevehicleext ext - LEFT JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code - LEFT JOIN md_me_materialbase mater ON mater.material_id = ext.material_id - LEFT JOIN md_pb_measureunit unit ON ext.qty_unit_id = unit.measure_unit_id + INNER JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code + INNER JOIN md_me_materialbase mater ON mater.material_id = ext.material_id + INNER JOIN md_pb_measureunit unit ON ext.qty_unit_id = unit.measure_unit_id attr.lock_type = '0' AND attr.is_used = "1" @@ -160,4 +160,34 @@ ORDER BY ext.insert_time Desc + +