Commit 1aa89f81 by 胡懿

修复出库后丢失台账信息的问题

parent 7554762d
...@@ -186,9 +186,6 @@ public class LedgerService extends CrudService<LedgerMapper, Ledger> { ...@@ -186,9 +186,6 @@ public class LedgerService extends CrudService<LedgerMapper, Ledger> {
public void ledgerStreamWater(String typeId, String beginTime, String endTime, HttpServletResponse respons) { public void ledgerStreamWater(String typeId, String beginTime, String endTime, HttpServletResponse respons) {
typeId = "4657ffc36fcf4feb922eb571231234b0";
beginTime = "2023-01-01 00:00:00";
endTime = "2023-12-01 00:00:00";
Date bTime = DateUtil.parseStrToDate(beginTime, "yyyy-MM-dd HH:mm:ss"); Date bTime = DateUtil.parseStrToDate(beginTime, "yyyy-MM-dd HH:mm:ss");
Date eTime = DateUtil.parseStrToDate(endTime, "yyyy-MM-dd HH:mm:ss"); Date eTime = DateUtil.parseStrToDate(endTime, "yyyy-MM-dd HH:mm:ss");
......
...@@ -138,9 +138,13 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM ...@@ -138,9 +138,13 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
if(materialRequisitionInfoList != null ){ if(materialRequisitionInfoList != null ){
for (MaterialRequisitionInfo one:materialRequisitionInfoList) { for (MaterialRequisitionInfo one:materialRequisitionInfoList) {
OutboundInfo outboundInfo = new OutboundInfo(); OutboundInfo outboundInfo = new OutboundInfo();
String ledgerInfoId = one.getLedgerInfo().getId(); /*String ledgerInfoId = one.getLedgerInfo().getId();
LedgerInfo ledgerInfo = ledgerInfoMapper.get(ledgerInfoId); LedgerInfo ledgerInfo = ledgerInfoMapper.get(ledgerInfoId);
ledgerInfoMapper.deleteByLedgerInfo(ledgerInfoId);
ledgerInfo.setNum(ledgerInfo.getNum() - 1);
ledgerInfoMapper.updateNum(ledgerInfo);
// ledgerInfoMapper.deleteByLedgerInfo(ledgerInfoId);
if(ledgerInfo.getQr() != null){ if(ledgerInfo.getQr() != null){
QrCode qrCode = qrCodeService.get(ledgerInfo.getQr().getId()); QrCode qrCode = qrCodeService.get(ledgerInfo.getQr().getId());
qrCode.setState("3"); qrCode.setState("3");
...@@ -157,7 +161,7 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM ...@@ -157,7 +161,7 @@ public class MaterialRequisitionService extends CrudService<MaterialRequisitionM
} }
ledgerService.lowerLedger(ledger); ledgerService.lowerLedger(ledger);
} }
} }*/
outboundInfo.setId(""); outboundInfo.setId("");
outboundInfo.setOutbound(outbound); outboundInfo.setOutbound(outbound);
outboundInfo.setLedgerInfo(one.getLedgerInfo()); outboundInfo.setLedgerInfo(one.getLedgerInfo());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment