|
@@ -816,14 +816,15 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
}
|
|
|
return temp;
|
|
|
}
|
|
|
- //查采购合同编号
|
|
|
+ //查采购合同编号(不包含自运)
|
|
|
if (flag == 0) {
|
|
|
List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
|
|
|
.eq("comp_id", compId)
|
|
|
.eq("contract_type", "2")
|
|
|
.eq("status_flag", "1")
|
|
|
+ .eq("deliver_type", "2")
|
|
|
.eq("delete_flag", "0")
|
|
|
- .orderBy("update_date", false));
|
|
|
+ .orderBy("update_date", false));cumulant
|
|
|
for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
|
|
|
ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
.eq("contract_id", contractManagementInfo.getId()));
|