领用更新台账信息，数量，总价，货架

src/main/java/com/jeeplus/modules/warehouse/ledger/mapper/LedgerMapper.java

@@ -6,6 +6,9 @@ package com.jeeplus.modules.warehouse.ledger.mapper;
 import com.jeeplus.core.persistence.BaseMapper;
 import com.jeeplus.core.persistence.annotation.MyBatisMapper;
 import com.jeeplus.modules.warehouse.ledger.entity.Ledger;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 台账信息MAPPER接口
@@ -16,4 +19,6 @@ import com.jeeplus.modules.warehouse.ledger.entity.Ledger;
 public interface LedgerMapper extends BaseMapper<Ledger> {
 
     public Ledger findByTypeAndModel(Ledger ledger);
+    //zlt 查询台账主表的货架集合
+    public List<String> findShelvesListByLedgerId(@Param("id") String id);
 }
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/ledger/mapper/xml/LedgerMapper.xml

@@ -176,4 +176,12 @@
 			AND a.name = #{name}
 		</where>
 	</select>
+	<select id="findShelvesListByLedgerId" resultType="java.lang.String" parameterType="java.lang.String">
+		select
+		shelves_id
+		from
+		t_wh_ledger_info li
+		where li.ledger_id = #{id}
+		and li.del_flag = '0'
+	</select>
 </mapper>
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/ledger/service/LedgerService.java

@@ -180,7 +180,21 @@ public class LedgerService extends CrudService<LedgerMapper, Ledger> {
 		super.delete(ledger);
 		ledgerInfoMapper.delete(new LedgerInfo(ledger));
 	}
-
+	/*
+	* 张吕涛
+	* 领用后下账,更新台账货架信息
+	* */
+	@Transactional(readOnly = false)
+	public void lowerLedger(Ledger ledger) {
+		List<String> shelvesListByLedgerId = mapper.findShelvesListByLedgerId(ledger.getId());
+		if(shelvesListByLedgerId == null || shelvesListByLedgerId.size() == 0){
+			ledger.setShelvesIds(null);
+		}else {
+			String shelvesIds = String.join(",", shelvesListByLedgerId);
+			ledger.setShelvesIds(shelvesIds);
+		}
+		mapper.update(ledger);
+	}
 	@Transactional(readOnly = false)
 	public LedgerInfo findByQrOrCode(LedgerInfo ledgerInfo) {
 		List<LedgerInfo> ledgerInfoList = ledgerInfoMapper.findList(ledgerInfo);

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

@@ -122,6 +122,7 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
 				OutboundInfo outboundInfo = new OutboundInfo();
 				String ledgerInfoId = one.getLedgerInfo().getId();
 				LedgerInfo ledgerInfo = ledgerInfoMapper.get(ledgerInfoId);
+				ledgerInfoMapper.deleteByLedgerInfo(ledgerInfoId);
 				if(ledgerInfo != null ){
 					Ledger ledger = ledgerService.get(ledgerInfo.getLedger().getId());
 					if(ledger != null){
@@ -131,10 +132,9 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
 						}catch (Exception e){
 							System.out.println(e.getMessage());
 						}
-						ledgerService.save(ledger);
+						ledgerService.lowerLedger(ledger);
 					}
 				}
-				ledgerInfoMapper.deleteByLedgerInfo(ledgerInfoId);
 				outboundInfo.setId("");
 				outboundInfo.setOutbound(outbound);
 				outboundInfo.setLedgerInfo(one.getLedgerInfo());