|
|
@@ -575,7 +575,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
|
|
|
//查询同名临时库出库量
|
|
|
List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList = stockPurchaseReceiptReportService.selectList(new EntityWrapper<StockPurchaseReceiptReport>()
|
|
|
.eq("warehouse_name", contractManagementInfo1.getContractNo())
|
|
|
- .eq("status_flag", "3")
|
|
|
+ .ge("status_flag", "1")
|
|
|
.eq("delete_flag", "0"));
|
|
|
if (!CollectionUtils.isEmpty(stockPurchaseReceiptReportList)) {
|
|
|
for (StockPurchaseReceiptReport stockPurchaseReceiptReport : stockPurchaseReceiptReportList) {
|
|
|
@@ -604,7 +604,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
|
|
|
//查询同合同编号入库量
|
|
|
List<StockPurchaseReceiptReport> stockPurchaseReceiptReportList = stockPurchaseReceiptReportService.selectList(new EntityWrapper<StockPurchaseReceiptReport>()
|
|
|
.eq("contract_no", contractManagementInfo1.getContractNo())
|
|
|
- .eq("status_flag", "3")
|
|
|
+ .ge("status_flag", "1")
|
|
|
.eq("delete_flag", "0"));
|
|
|
if (!CollectionUtils.isEmpty(stockPurchaseReceiptReportList)) {
|
|
|
for (StockPurchaseReceiptReport stockPurchaseReceiptReport : stockPurchaseReceiptReportList) {
|
|
|
@@ -627,7 +627,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
|
|
|
//查询同合同编号出库量
|
|
|
List<StockSaleReceiptReport> stockSaleReceiptReportList = stockSaleReceiptReportService.selectList(new EntityWrapper<StockSaleReceiptReport>()
|
|
|
.eq("contract_no", contractManagementInfo1.getContractNo())
|
|
|
- .eq("status_flag", "3")
|
|
|
+ .ge("status_flag", "8")
|
|
|
.eq("delete_flag", "0"));
|
|
|
if (!CollectionUtils.isEmpty(stockSaleReceiptReportList)) {
|
|
|
for (StockSaleReceiptReport stockSaleReceiptReport : stockSaleReceiptReportList) {
|
|
|
@@ -664,7 +664,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
|
|
|
List<StockSaleReceiptReport> stockSaleReceiptReportList1 = stockSaleReceiptReportService.selectList(new EntityWrapper<StockSaleReceiptReport>()
|
|
|
.eq("contract_no", contractManagementInfo1.getContractNo())
|
|
|
.eq("return_flag", "1")
|
|
|
- .eq("status_flag", "3")
|
|
|
+ .ge("status_flag", "8")
|
|
|
.eq("delete_flag", "0"));
|
|
|
if (!CollectionUtils.isEmpty(stockSaleReceiptReportList1)) {
|
|
|
for (StockSaleReceiptReport stockSaleReceiptReport : stockSaleReceiptReportList1) {
|
