修改领用模块查看列表详情逻辑

src/main/java/com/jeeplus/modules/warehouse/materialloss/mapper/xml/MaterialLossInfoMapper.xml

@@ -6,15 +6,14 @@
 		a.id AS "id",
 		a.material_loss_id AS "materialLoss.id",
 		a.ledger_info_id AS "ledgerInfo.id",
-		ledgerInfo.name AS "ledgerInfo.name",
 		ledgerInfo.code AS "ledgerInfo.code",
 		ledgerInfo.type_id AS "ledgerInfo.type.id",
-		ledgerInfo.batch_num AS "ledgerInfo.batch_num",
-		ledgerInfo.shelves_id AS "ledgerInfo.shelves.id",
-		warehouse.id AS "ledgerInfo.shelves.warehouse.id",
-		warehouse.name AS "ledgerInfo.shelves.warehouse.name",
-		shelves.name AS "ledgerInfo.shelves.name",
+		ledgerInfo.batch_num AS "ledgerInfo.batchNum",
+		ledgerInfo.shelves_ids AS "ledgerInfo.shelvesIds",
+		ledgerInfo.warehouse_ids AS "ledgerInfo.warehouseIds",
 		tpye.name AS "ledgerInfo.type.name",
+		tpye.code AS "ledgerInfo.type.code",
+		tpye.unit AS "ledgerInfo.type.unit",
 		ledgerInfo.model AS "ledgerInfo.model",
 		ledgerInfo.amount AS "ledgerInfo.amount",
 		a.remarks AS "remarks",
@@ -27,8 +26,6 @@
 	
 	<sql id="materialLossInfoJoins">
 		left join t_wh_ledger_info ledgerInfo on a.ledger_info_id = ledgerInfo.id
-		left join t_wh_shelves shelves on ledgerInfo.shelves_id = shelves.id
-		left join t_wh_warehouse warehouse on shelves.warehouse_id = warehouse.id
 		LEFT JOIN t_wh_material_type tpye ON ledgerInfo.type_id = tpye.id
 	</sql>
 	

src/main/java/com/jeeplus/modules/warehouse/materialrequisition/mapper/xml/MaterialRequisitionInfoMapper.xml

@@ -6,19 +6,28 @@
 		a.id AS "id",
 		a.material_requisition_id AS "materialRequisition.id",
 		a.ledger_info_id AS "ledgerInfo.id",
+		a.remarks AS "remarks",
+		a.receiver AS "receiver",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
 		a.update_date AS "updateDate",
-		a.del_flag AS "delFlag",
-		ledgerInfo.name AS "ledgerInfo.name",
+
 		ledgerInfo.code AS "ledgerInfo.code",
-		ledgerInfo.type_id AS "ledgerInfo.type.id",
-		tpye.name AS "ledgerInfo.type.name",
+		ledgerInfo.batch_num AS "ledgerInfo.batchNum",
 		ledgerInfo.model AS "ledgerInfo.model",
 		ledgerInfo.amount AS "ledgerInfo.amount",
-		a.remarks AS "remarks",
-		a.receiver AS "receiver"
+		ledgerInfo.shelves_ids AS "ledgerInfo.shelvesIds",
+		ledgerInfo.warehouse_ids AS "ledgerInfo.warehouseIds",
+
+
+		ledgerInfo.type_id AS "ledgerInfo.type.id",
+		tpye.name AS "ledgerInfo.type.name",
+		tpye.code AS "ledgerInfo.type.code",
+		tpye.unit AS "ledgerInfo.type.unit",
+
+
+		a.del_flag AS "delFlag"
 	</sql>
 	
 	<sql id="materialRequisitionInfoJoins">

src/main/java/com/jeeplus/modules/warehouse/materialrequisition/service/MaterialRequisitionService.java

@@ -19,6 +19,9 @@ import com.jeeplus.modules.warehouse.outbound.entity.OutboundInfo;
 import com.jeeplus.modules.warehouse.outbound.service.OutboundService;
 import com.jeeplus.modules.warehouse.qrcode.entity.QrCode;
 import com.jeeplus.modules.warehouse.qrcode.service.QrCodeService;
+import com.jeeplus.modules.warehouse.shelves.entity.Shelves;
+import com.jeeplus.modules.warehouse.shelves.utils.ShelvesUtil;
+import com.jeeplus.modules.warehouse.warehouse.entity.Warehouse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -54,7 +57,15 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
 
 	public MaterialRequisition get(String id) {
 		MaterialRequisition materialRequisition = super.get(id);
-		materialRequisition.setMaterialRequisitionInfoList(materialRequisitionInfoMapper.findList(new MaterialRequisitionInfo(materialRequisition)));
+		List<MaterialRequisitionInfo> list = materialRequisitionInfoMapper.findList(new MaterialRequisitionInfo(materialRequisition));
+		for (MaterialRequisitionInfo mri : list) {
+			LedgerInfo li = mri.getLedgerInfo();
+			List<Shelves> shelvesList = ShelvesUtil.getShelvesListByIds(li.getShelvesIds());
+			li.setShelvesList(shelvesList);
+			List<Warehouse> warehouseList = ShelvesUtil.getWarehouseListByIds(li.getWarehouseIds());
+			li.setWarehouseList(warehouseList);
+		}
+		materialRequisition.setMaterialRequisitionInfoList(list);
 		return materialRequisition;
 	}