Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/warehouse/profitwarehousing/service/ProfitWarehousingService.java

@@ -199,6 +199,7 @@ public class ProfitWarehousingService extends CrudService<ProfitWarehousingMappe
 	//盘盈入库 保存 盘盈入库信息 ，并添加对应的台账信息
 	@Transactional(readOnly = false)
 	public void inLedgerInfo(ProfitWarehousingInfo profitWarehousingInfo) {
+		profitWarehousingInfo = profitWarehousingInfoMapper.get(profitWarehousingInfo.getId());
 		QrCode qrCode = qrCodeService.get(profitWarehousingInfo.getQrCode().getId());
 		Ledger ledger = new Ledger(profitWarehousingInfo.getType());
 		Ledger oldLeger = ledgerMapper.findByType(ledger);
@@ -213,6 +214,8 @@ public class ProfitWarehousingService extends CrudService<ProfitWarehousingMappe
 		ledgerInfo.setQr(qrCode);
 		//货架id
 		ledgerInfo.setShelvesIds(profitWarehousingInfo.getShelvesIds());
+		//仓库id
+		ledgerInfo.setWarehouseIds(profitWarehousingInfo.getWarehouseIds());
 		//盘盈入库单编码
 		ledgerInfo.setBatchNum(profitWarehousingInfo.getProfitWarehousing().getNumber());
 		//单价